This commit is contained in:
Joey Hess 2014-12-06 15:28:30 -04:00
parent bdbf787e2c
commit 7983046cd5
1 changed files with 7 additions and 6 deletions

View File

@ -1,7 +1,7 @@
module Propellor.Property.OS ( module Propellor.Property.OS (
cleanInstallOnce, cleanInstallOnce,
Confirmation(..), Confirmation(..),
preserveNetworkInterfaces, preserveNetwork,
preserveResolvConf, preserveResolvConf,
preserveRootSshAuthorized, preserveRootSshAuthorized,
oldOSRemoved, oldOSRemoved,
@ -46,7 +46,7 @@ import Control.Exception (throw)
-- > & os (System (Debian Unstable) "amd64") -- > & os (System (Debian Unstable) "amd64")
-- > & cleanInstallOnce (Confirmed "foo.example.com") -- > & cleanInstallOnce (Confirmed "foo.example.com")
-- > `onChange` propertyList "fixing up after clean install" -- > `onChange` propertyList "fixing up after clean install"
-- > [ preserveNetworkInterfaces -- > [ preserveNetwork
-- > , preserveResolvConf -- > , preserveResolvConf
-- > , preserverRootSshAuthorized -- > , preserverRootSshAuthorized
-- > , Apt.update -- > , Apt.update
@ -181,10 +181,11 @@ confirmed desc (Confirmed c) = property desc $ do
return FailedChange return FailedChange
else return NoChange else return NoChange
-- | /etc/network/interfaces is configured to bring up all interfaces that -- | /etc/network/interfaces is configured to bring up the network
-- are currently up, using the same IP addresses. -- interface that currently has a default route configured, using
preserveNetworkInterfaces :: Property -- the same (static) IP address.
preserveNetworkInterfaces = undefined -- TODO preserveNetwork :: Property
preserveNetwork = undefined -- TODO
-- | /etc/resolv.conf is copied the from the old OS -- | /etc/resolv.conf is copied the from the old OS
preserveResolvConf :: Property preserveResolvConf :: Property