cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'joeyconfig'

This commit is contained in:
Joey Hess 2014-12-08 01:07:44 -04:00
parent 1d02d589c7 3c7219874b
commit 9841594c85
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Propellor/Property/Reboot.hs
View File

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