summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/OS.hs
diff options
context:
space:
mode:
authorJoey Hess2014-12-06 15:28:30 -0400
committerJoey Hess2014-12-06 15:28:30 -0400
commit7983046cd593142373aefd23dee6c1d84400cf1b (patch)
treef124e08a07a5be4a82f489df7d9b9d652fa882b2 /src/Propellor/Property/OS.hs
parentbdbf787e2cf1123429491da5f06f46a8dc8774f6 (diff)
update
Diffstat (limited to 'src/Propellor/Property/OS.hs')
-rw-r--r--src/Propellor/Property/OS.hs13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs
index 2185471d..2720b476 100644
--- a/src/Propellor/Property/OS.hs
+++ b/src/Propellor/Property/OS.hs
@@ -1,7 +1,7 @@
module Propellor.Property.OS (
cleanInstallOnce,
Confirmation(..),
- preserveNetworkInterfaces,
+ preserveNetwork,
preserveResolvConf,
preserveRootSshAuthorized,
oldOSRemoved,
@@ -46,7 +46,7 @@ import Control.Exception (throw)
-- > & os (System (Debian Unstable) "amd64")
-- > & cleanInstallOnce (Confirmed "foo.example.com")
-- > `onChange` propertyList "fixing up after clean install"
--- > [ preserveNetworkInterfaces
+-- > [ preserveNetwork
-- > , preserveResolvConf
-- > , preserverRootSshAuthorized
-- > , Apt.update
@@ -181,10 +181,11 @@ confirmed desc (Confirmed c) = property desc $ do
return FailedChange
else return NoChange
--- | /etc/network/interfaces is configured to bring up all interfaces that
--- are currently up, using the same IP addresses.
-preserveNetworkInterfaces :: Property
-preserveNetworkInterfaces = undefined -- TODO
+-- | /etc/network/interfaces is configured to bring up the network
+-- interface that currently has a default route configured, using
+-- the same (static) IP address.
+preserveNetwork :: Property
+preserveNetwork = undefined -- TODO
-- | /etc/resolv.conf is copied the from the old OS
preserveResolvConf :: Property