summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/OS.hs
diff options
context:
space:
mode:
authorJoey Hess2014-12-06 13:21:19 -0400
committerJoey Hess2014-12-06 13:21:19 -0400
commit29442f222ec2342c6dea7036e80e15eefa4158c0 (patch)
treef29929e1d14f7aa8a7e8c662fcad237a3b7e143e /src/Propellor/Property/OS.hs
parent62697c7b7f7ba2d39bfad632f1cf720c9805bdd2 (diff)
Reboot.atEnd
Diffstat (limited to 'src/Propellor/Property/OS.hs')
-rw-r--r--src/Propellor/Property/OS.hs8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Propellor/Property/OS.hs b/src/Propellor/Property/OS.hs
index e84490fd..2185471d 100644
--- a/src/Propellor/Property/OS.hs
+++ b/src/Propellor/Property/OS.hs
@@ -11,6 +11,7 @@ import Propellor
import qualified Propellor.Property.Debootstrap as Debootstrap
import qualified Propellor.Property.Ssh as Ssh
import qualified Propellor.Property.File as File
+import qualified Propellor.Property.Reboot as Reboot
import Propellor.Property.Mount
import Propellor.Property.Chroot.Util (stdPATH)
import Utility.SafeCommand
@@ -67,6 +68,8 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
go =
finalized
`requires`
+ Reboot.atEnd True (/= FailedChange)
+ `requires`
propellorbootstrapped
`requires`
flipped
@@ -137,11 +140,6 @@ cleanInstallOnce confirmation = check (not <$> doesFileExist flagfile) $
finalized = property "clean OS installed" $ do
liftIO $ writeFile flagfile ""
- endAction "rebooting into new OS" $ liftIO $
- ifM (boolSystem "reboot" [ Param "--force" ])
- ( return MadeChange
- , return FailedChange
- )
return MadeChange
flagfile = "/etc/propellor-cleaninstall"