diff options
| author | Joey Hess <joeyh@joeyh.name> | 2014-12-08 01:07:44 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2014-12-08 01:07:44 -0400 |
| commit | 9841594c852bd7a663c25b961df11400557502f5 (patch) | |
| tree | 876976d879df234ee952a430962039299ab52794 /src | |
| parent | 1d02d589c79781cc4b0bd82467edbdf64c40f34d (diff) | |
| parent | 3c7219874b8b44c93fe8fd29462dc0bb3336967c (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Property/Reboot.hs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/Propellor/Property/Reboot.hs b/src/Propellor/Property/Reboot.hs index c2628689..ac6f3a44 100644 --- a/src/Propellor/Property/Reboot.hs +++ b/src/Propellor/Property/Reboot.hs @@ -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 |