diff options
| -rw-r--r-- | config-joey.hs | 2 | ||||
| -rw-r--r-- | src/Propellor/Property/DiskImage.hs | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/config-joey.hs b/config-joey.hs index 9148fe4e..fce4f7a1 100644 --- a/config-joey.hs +++ b/config-joey.hs @@ -84,9 +84,7 @@ darkstar = host "darkstar.kitenet.net" & imageBuilt "/tmp/img" c MSDOS (grubBooted PC) [ partition EXT2 `mountedAt` "/boot" `setFlag` BootFlag - -- `addFreeSpace` MegaBytes 200 , partition EXT4 `mountedAt` "/" - -- `addFreeSpace` MegaBytes 200 , swapPartition (MegaBytes 256) ] where diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs index b6cfbc1a..19c3a545 100644 --- a/src/Propellor/Property/DiskImage.hs +++ b/src/Propellor/Property/DiskImage.hs @@ -227,9 +227,10 @@ defSz = MegaBytes 128 -- Add 2% for filesystem overhead. Rationalle for picking 2%: -- A filesystem with 1% overhead might just sneak by as acceptable. -- Double that just in case. Add an additional 3 mb to deal with --- non-scaling overhead, of filesystems (eg, superblocks). +-- non-scaling overhead of filesystems (eg, superblocks). +-- Add an additional 100 mb for temp files etc. fudge :: PartSize -> PartSize -fudge (MegaBytes n) = MegaBytes (n + n `div` 100 * 2 + 3) +fudge (MegaBytes n) = MegaBytes (n + n `div` 100 * 2 + 3 + 100) -- | Specifies a mount point and a constructor for a Partition. -- |