Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-12-08 01:07:44 -04:00
commit 9841594c85
1 changed files with 2 additions and 5 deletions

View File

@ -20,11 +20,8 @@ atEnd force resultok = property "scheduled reboot at end of propellor run" $ do
return NoChange
where
atend r
| resultok r = liftIO $
ifM (boolSystem "reboot" rebootparams)
( return MadeChange
, return FailedChange
)
| resultok r = liftIO $ toResult
<$> boolSystem "reboot" rebootparams
| otherwise = do
warningMessage "Not rebooting, due to status of propellor run."
return FailedChange