summaryrefslogtreecommitdiff
path: root/src/Propellor/Property
diff options
context:
space:
mode:
authorJoey Hess2016-03-28 03:54:28 -0400
committerJoey Hess2016-03-28 03:54:28 -0400
commit67a1bb6d9915a0c36b71d984cf0ef4c89dd59607 (patch)
treef4a6d24569c1fcac49eca1b8597dcd3dd89f7d28 /src/Propellor/Property
parentd725caa03420d5f3b9ffe6124de39ab00979f7cb (diff)
propellor spin
Diffstat (limited to 'src/Propellor/Property')
-rw-r--r--src/Propellor/Property/Grub.hs10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/Propellor/Property/Grub.hs b/src/Propellor/Property/Grub.hs
index b8dc5f9e..85d098ed 100644
--- a/src/Propellor/Property/Grub.hs
+++ b/src/Propellor/Property/Grub.hs
@@ -30,13 +30,11 @@ mkConfig = tightenTargets $ cmdProperty "update-grub" []
-- | Installs grub; does not run update-grub.
installed' :: BIOS -> Property Linux
-installed' bios = withOS "grub package installed" $ \w o ->
- let apt = ensureProperty w (Apt.installed [debpkg])
- in case o of
- (Just (System (Debian _) _)) -> apt
- (Just (System (Buntish _) _)) -> apt
- _ -> unsupportedOS
+installed' bios = (aptinstall `pickOS` aptinstall)
+ `describe` "grub package installed"
where
+ aptinstall :: Property DebianLike
+ aptinstall = Apt.installed [debpkg]
debpkg = case bios of
PC -> "grub-pc"
EFI64 -> "grub-efi-amd64"