summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config-joey.hs4
-rw-r--r--src/Propellor/Property/DiskImage.hs1
2 files changed, 3 insertions, 2 deletions
diff --git a/config-joey.hs b/config-joey.hs
index ceabc252..9148fe4e 100644
--- a/config-joey.hs
+++ b/config-joey.hs
@@ -84,9 +84,9 @@ darkstar = host "darkstar.kitenet.net"
& imageBuilt "/tmp/img" c MSDOS (grubBooted PC)
[ partition EXT2 `mountedAt` "/boot"
`setFlag` BootFlag
- `addFreeSpace` MegaBytes 200
+ -- `addFreeSpace` MegaBytes 200
, partition EXT4 `mountedAt` "/"
- `addFreeSpace` MegaBytes 200
+ -- `addFreeSpace` MegaBytes 200
, swapPartition (MegaBytes 256)
]
where
diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs
index 607c7b61..b6cfbc1a 100644
--- a/src/Propellor/Property/DiskImage.hs
+++ b/src/Propellor/Property/DiskImage.hs
@@ -352,6 +352,7 @@ grubBooted bios = (Grub.installed' bios, boots)
[ bindMount "/dev" (inmnt "/dev")
, mounted "proc" "proc" (inmnt "/proc")
, mounted "sysfs" "sys" (inmnt "/sys")
+ -- update the initramfs so it gets the uuid of the root partition
, inchroot "update-initramfs" ["-u"]
-- work around for http://bugs.debian.org/802717
, check haveosprober $ inchroot "chmod" ["-x", osprober]