diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-12-06 14:33:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-06 14:33:22 -0400 |
| commit | 6c7ad5b021ae46be1fda3004f9c578ab2471d9aa (patch) | |
| tree | 4319434104db22cc4598746eeb2d6fbf244ed7be /src/Propellor/Property/DiskImage.hs | |
| parent | 616c6c2e2c2c7dcafa9bc72c7c1bdea650e43e43 (diff) | |
| parent | 516b7cb886470c6a86d4022d7cf20a8547a98bd9 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/DiskImage.hs')
| -rw-r--r-- | src/Propellor/Property/DiskImage.hs | 4 |
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 |