Merge branch 'master' into joeyconfig

2 files changed, 28 insertions, 11 deletions

diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs
index 4d10f300..332ad96a 100644
--- a/src/Propellor/Property/DiskImage.hs
+++ b/src/Propellor/Property/DiskImage.hs
@@ -174,9 +174,7 @@ imageBuiltFrom img chrootdir tabletype final partspec = mkimg <!> rmimg
 		let (mnts, mntopts, parttable) = fitChrootSize tabletype partspec $
 			map (calcsz mnts) mnts
 		ensureProperty w $
-			imageExists img (partTableSize parttable)
-				`before`
-			partitioned YesReallyDeleteDiskContents img parttable
+			imageSetup img parttable
 				`before`
 			kpartx img (mkimg' mnts mntopts parttable)
 	mkimg' mnts mntopts parttable devs =
@@ -273,6 +271,24 @@ imageExists img isz = property ("disk image exists" ++ img) $ liftIO $ do
 	-- Common sector sizes are 512 and 4096; use 4096 as it's larger.
 	sectorsize = 4096 :: Double
 
+-- | Ensure that disk image file exists and is partitioned.
+--
+-- Avoids repartitioning the disk image, when a file of the right size
+-- already exists, and it has the same PartTable.
+imageSetup :: FilePath -> PartTable -> Property DebianLike
+imageSetup img parttable = property' ("disk image set up " ++ img) $ \w -> do
+	oldparttable <- liftIO $ catchDefaultIO "" $ readFile parttablefile
+	res <- ensureProperty w $ imageExists img (partTableSize parttable)
+	if res == NoChange && oldparttable == show parttable
+		then return NoChange
+		else if res == FailedChange
+			then return FailedChange
+			else do
+				liftIO $ writeFile parttablefile (show parttable)
+				ensureProperty w $ partitioned YesReallyDeleteDiskContents img parttable
+  where
+	parttablefile = img ++ ".parttable"
+
 -- | A property that is run after the disk image is created, with
 -- its populated partition tree mounted in the provided
 -- location from the provided loop devices. This is typically used to
diff --git a/src/Propellor/Property/Reboot.hs b/src/Propellor/Property/Reboot.hs
index 3781cd7b..909d87fb 100644
--- a/src/Propellor/Property/Reboot.hs
+++ b/src/Propellor/Property/Reboot.hs
@@ -78,15 +78,16 @@ toKernelNewerThan ver =
 	property' ("reboot to kernel newer than " ++ ver) $ \w -> do
 		wantV <- tryReadVersion ver
 		runningV <- tryReadVersion =<< liftIO runningKernelVersion
-		installedV <- maximum <$>
-			(mapM tryReadVersion =<< liftIO installedKernelVersions)
 		if runningV >= wantV then noChange
-			else if installedV >= wantV
-				then ensureProperty w now
-				else errorMessage $
-					"kernel newer than "
-					++ ver
-					++ " not installed"
+			else maximum <$> installedVs >>= \installedV ->
+				if installedV >= wantV
+					then ensureProperty w now
+					else errorMessage $
+						"kernel newer than "
+						++ ver
+						++ " not installed"
+  where
+	installedVs = mapM tryReadVersion =<< liftIO installedKernelVersions
 
 runningInstalledKernel :: IO Bool
 runningInstalledKernel = do