diff options
| author | Joey Hess <id@joeyh.name> | 2014-12-07 12:04:58 -0400 |
|---|---|---|
| committer | Joey Hess <id@joeyh.name> | 2014-12-07 12:04:58 -0400 |
| commit | 322ae878bbaef94736fdc4cae60b6c3b8c17a54d (patch) | |
| tree | 4113593f21d964ad8f821ebbd408a528011f1398 /src/Propellor/Property/HostingProvider | |
| parent | b7da90a91516c0d496c44459ed03009e58f39233 (diff) | |
| parent | dd40a05ced3b7c50a3a7751c66ad5a253056459e (diff) | |
Merge branch 'joeyconfig'
Conflicts:
privdata.joey/privdata.gpg
Diffstat (limited to 'src/Propellor/Property/HostingProvider')
| -rw-r--r-- | src/Propellor/Property/HostingProvider/DigitalOcean.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Property/HostingProvider/DigitalOcean.hs b/src/Propellor/Property/HostingProvider/DigitalOcean.hs index 32165d48..4d2534ec 100644 --- a/src/Propellor/Property/HostingProvider/DigitalOcean.hs +++ b/src/Propellor/Property/HostingProvider/DigitalOcean.hs @@ -5,6 +5,7 @@ module Propellor.Property.HostingProvider.DigitalOcean ( import Propellor import qualified Propellor.Property.Apt as Apt import qualified Propellor.Property.File as File +import qualified Propellor.Property.Reboot as Reboot import Data.List @@ -24,9 +25,8 @@ distroKernel = propertyList "digital ocean distro kernel hack" [ "LOAD_KEXEC=true" , "USE_GRUB_CONFIG=true" ] `describe` "kexec configured" - , check (not <$> runningInstalledKernel) - (cmdProperty "reboot" []) - `describe` "running installed kernel" + , check (not <$> runningInstalledKernel) Reboot.now + `describe` "running installed kernel" ] runningInstalledKernel :: IO Bool |