From 94d6f453e7441749a83f0ea69d0e7c12737565a1 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Aug 2015 17:29:01 -0700 Subject: propellor spin (cherry picked from commit 7087a94b21a086a98784d17b45dd2b7779e320e9) --- src/Propellor/Property/DiskImage.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/Propellor/Property/DiskImage.hs') diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs index a3d4073a..691f79bc 100644 --- a/src/Propellor/Property/DiskImage.hs +++ b/src/Propellor/Property/DiskImage.hs @@ -57,8 +57,8 @@ type MountPoint = Maybe FilePath -- exploiting laziness and tying the knot. -- -- (Partitions that are not mounted (ie, LinuxSwap) will have 128 MegaBytes --- provides as a default size.) -type MkPartTable = [MegaBytes] -> ([MountPoint], PartTable) +-- provided as a default size.) +type MkPartTable = [PartSize] -> ([MountPoint], PartTable) -- TODO tie the knot -- let f = fitChrootSize MSDOS [(Just "/", mkPartition EXT2)] @@ -69,7 +69,7 @@ type MkPartTable = [MegaBytes] -> ([MountPoint], PartTable) -- -- Partitions that are not mounted (ie, LinuxSwap) will have their size -- set to 128 MegaBytes, unless it's overridden. -fitChrootSize :: TableType -> [(MountPoint, MegaBytes -> Partition)] -> MkPartTable +fitChrootSize :: TableType -> [(MountPoint, PartSize -> Partition)] -> MkPartTable fitChrootSize tt l basesizes = (mounts, parttable) where (mounts, sizers) = unzip l -- cgit v1.3-2-g0d8e