diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-12-05 17:53:32 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-12-05 17:53:32 -0400 |
| commit | 97a224b194b96184c7938de0bb1e1f423612ccbc (patch) | |
| tree | 7cc147c4726af8644510c07ba87597920f8301dc /src/Propellor/Property/DiskImage.hs | |
| parent | 5c6a43c3b888242443d790efbc1f9282e4e5675c (diff) | |
| parent | 12548bae3d8feecce6a322162d91b827289ae824 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/DiskImage.hs')
| -rw-r--r-- | src/Propellor/Property/DiskImage.hs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs index 2e0ec661..79237e61 100644 --- a/src/Propellor/Property/DiskImage.hs +++ b/src/Propellor/Property/DiskImage.hs @@ -287,15 +287,21 @@ grubBooted bios = (Grub.installed' bios, boots) , mounted "sysfs" "sys" (inmnt "/sys") mempty -- update the initramfs so it gets the uuid of the root partition , inchroot "update-initramfs" ["-u"] + `assume` MadeChange -- work around for http://bugs.debian.org/802717 , check haveosprober $ inchroot "chmod" ["-x", osprober] + `assume` MadeChange , 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 -- may not be necessary, but seemed needed sometimes -- when using the disk image right away. , cmdProperty "sync" [] + `assume` NoChange ] where -- cannot use </> since the filepath is absolute |