summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/DiskImage.hs
diff options
context:
space:
mode:
authorJoey Hess2017-12-20 17:12:50 -0400
committerJoey Hess2017-12-20 17:12:50 -0400
commitb69c53fdd26a9845820189f339d0c4506b017ff8 (patch)
treeb649a0655470248991ba1ecf921db2fe204c817d /src/Propellor/Property/DiskImage.hs
parent2a9d0bb514aa4744590db91fee0a8439f9c937a5 (diff)
parent4e20a920baa6c9106179c3d8a1e8e66ffd50ce9c (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Property/DiskImage.hs')
-rw-r--r--src/Propellor/Property/DiskImage.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs
index 6564192f..79865db4 100644
--- a/src/Propellor/Property/DiskImage.hs
+++ b/src/Propellor/Property/DiskImage.hs
@@ -265,7 +265,7 @@ imageBuiltFrom img chrootdir tabletype final partspec = mkimg <!> rmimg
imageFinalized final dest mnts mntopts devs parttable
rmimg = undoRevertableProperty (buildDiskImage img)
`before` undoRevertableProperty (imageExists' dest dummyparttable)
- dummyparttable = PartTable tabletype []
+ dummyparttable = PartTable tabletype safeAlignment []
partitionsPopulated :: FilePath -> [Maybe MountPoint] -> [MountOpts] -> [LoopDev] -> Property DebianLike
partitionsPopulated chrootdir mnts mntopts devs = property' desc $ \w ->
@@ -300,7 +300,7 @@ fitChrootSize :: TableType -> [PartSpec ()] -> [PartSize] -> ([Maybe MountPoint]
fitChrootSize tt l basesizes = (mounts, mountopts, parttable)
where
(mounts, mountopts, sizers, _) = unzip4 l
- parttable = PartTable tt (zipWith id sizers basesizes)
+ parttable = PartTable tt safeAlignment (zipWith id sizers basesizes)
-- | Generates a map of the sizes of the contents of
-- every directory in a filesystem tree.
@@ -388,7 +388,7 @@ imageExists' dest@(RawDiskImage img) parttable = (setup <!> cleanup) `describe`
type Finalization = (RawDiskImage -> FilePath -> [LoopDev] -> Property Linux)
imageFinalized :: Finalization -> RawDiskImage -> [Maybe MountPoint] -> [MountOpts] -> [LoopDev] -> PartTable -> Property Linux
-imageFinalized final img mnts mntopts devs (PartTable _ parts) =
+imageFinalized final img mnts mntopts devs (PartTable _ _ parts) =
property' "disk image finalized" $ \w ->
withTmpDir "mnt" $ \top ->
go w top `finally` liftIO (unmountall top)