summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/DiskImage.hs
diff options
context:
space:
mode:
authorJoey Hess2015-12-06 14:24:44 -0400
committerJoey Hess2015-12-06 14:24:44 -0400
commit030f13f2d0501c9fb42c8f1efa0a15fa63c94d67 (patch)
treef81cbf9524d258daea72ab09866a6a8fe526c827 /src/Propellor/Property/DiskImage.hs
parent94f91a44810dc3a1eca95c843e3c444cbbe87006 (diff)
allow using `check` on a UncheckedProperty, which yields a Property
Diffstat (limited to 'src/Propellor/Property/DiskImage.hs')
-rw-r--r--src/Propellor/Property/DiskImage.hs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs
index 79237e61..6200f856 100644
--- a/src/Propellor/Property/DiskImage.hs
+++ b/src/Propellor/Property/DiskImage.hs
@@ -289,12 +289,10 @@ grubBooted bios = (Grub.installed' bios, boots)
, inchroot "update-initramfs" ["-u"]
`assume` MadeChange
-- work around for http://bugs.debian.org/802717
- , check haveosprober $ inchroot "chmod" ["-x", osprober]
- `assume` MadeChange
+ , check haveosprober $ inchroot "chmod" ["-x", osprober]
, inchroot "update-grub" []
`assume` MadeChange
, check haveosprober $ inchroot "chmod" ["+x", osprober]
- `assume` MadeChange
, inchroot "grub-install" [wholediskloopdev]
`assume` MadeChange
-- sync all buffered changes out to the disk image