From e1984420b3f1fbca1c3413c4d09ac958c0c13a1c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 25 Jul 2017 17:51:36 -0400 Subject: propellor spin --- debian/changelog | 2 +- joeyconfig.hs | 1 + src/Propellor/Property/DiskImage.hs | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca9e40e9..8e9cb7ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ propellor (4.5.2) UNRELEASED; urgency=medium * Added Rsync.installed property. - * Added DiskImage.vmdkBuilt property which is useful for booting + * Added DiskImage.vmdkBuiltFor property which is useful for booting a disk image in VirtualBox. -- Joey Hess Tue, 25 Jul 2017 17:08:52 -0400 diff --git a/joeyconfig.hs b/joeyconfig.hs index a6d913ef..35b5363c 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -99,6 +99,7 @@ darkstar = host "darkstar.kitenet.net" $ props , partition EXT4 `mountedAt` "/" , swapPartition (MegaBytes 256) ] + `before` vmdkBuiltFor "/srv/test.img" where mychroot d = debootstrapped mempty d $ props & osDebian Unstable X86_64 diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs index dd42265d..9289aad3 100644 --- a/src/Propellor/Property/DiskImage.hs +++ b/src/Propellor/Property/DiskImage.hs @@ -13,7 +13,7 @@ module Propellor.Property.DiskImage ( imageRebuilt, imageBuiltFrom, imageExists, - vmdkBuilt, + vmdkBuiltFor, Grub.BIOS(..), ) where @@ -412,8 +412,8 @@ toSysDir chrootdir d = case makeRelative chrootdir d of sysdir -> "/" ++ sysdir -- | Builds a VirtualBox .vmdk file for the specified disk image file. -vmdkBuilt :: FilePath -> RevertableProperty DebianLike UnixLike -vmdkBuilt diskimage = (setup cleanup) +vmdkBuiltFor :: FilePath -> RevertableProperty DebianLike UnixLike +vmdkBuiltFor diskimage = (setup cleanup) `describe` (vmdkfile ++ " built") where vmdkfile = diskimage ++ ".vmdk" -- cgit v1.2.3