From c95f05ef8874b21c9a4f9756b8af79e178d80232 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Aug 2015 14:41:28 -0700 Subject: improve config types (cherry picked from commit 836133fd405212c31ac7e661cd3bbb6ed305cbc4) --- src/Propellor/Property/DiskImage.hs | 91 ++++++++++++++++++++++++++----------- 1 file changed, 64 insertions(+), 27 deletions(-) diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs index cb373c94..a3d4073a 100644 --- a/src/Propellor/Property/DiskImage.hs +++ b/src/Propellor/Property/DiskImage.hs @@ -3,56 +3,93 @@ module Propellor.Property.DiskImage ( built, rebuilt, - DiskImageConfig(..), + MountPoint, + MkPartTable, + fitChrootSize, + freeSpace, DiskImageFinalization, grubBooted, + Grub.BIOS(..), ) where import Propellor import Propellor.Property.Chroot import Propellor.Property.Parted +import qualified Propellor.Property.Grub as Grub -- | Creates a bootable disk image. -- -- First the specified Chroot is set up, and its properties are satisfied. --- Then a disk image is created, large enough to fit the chroot, which --- is copied into it. Finally, the DiskImageFinalization property is +-- +-- Then, the disk image is set up, and the chroot is copied into the +-- appropriate partition(s) of it. +-- +-- Finally, the DiskImageFinalization property is -- satisfied to make the disk image bootable. -- -- > let chroot d = Chroot.debootstrapped (System (Debian Unstable) "amd64") mempty d --- > & Apt.installed ["openssh-server"] --- > & Grub.installed Grub.PC --- > & ... --- > in DiskImage.built mempty chroot DiskImage.grubBooted -built :: DiskImageConfig -> (FilePath -> Chroot) -> DiskImageFinalization -> RevertableProperty +-- > & Apt.installed ["openssh-server"] +-- > & ... +-- > partitions = fitChrootSize MSDOS +-- > [ (Just "/boot", mkPartiton EXT2) +-- > , (Just "/", mkPartition EXT4) +-- > , (Nothing, const (mkPartition LinuxSwap (MegaBytes 256))) +-- > ] +-- > in built chroot partitions (grubBooted PC) +built :: (FilePath -> Chroot) -> MkPartTable -> DiskImageFinalization -> RevertableProperty built = built' False -- | Like 'built', but the chroot is deleted and rebuilt from scratch each -- time. This is more expensive, but useful to ensure reproducible results -- when the properties of the chroot have been changed. -rebuilt :: DiskImageConfig -> (FilePath -> Chroot) -> DiskImageFinalization -> RevertableProperty +rebuilt :: (FilePath -> Chroot) -> MkPartTable -> DiskImageFinalization -> RevertableProperty rebuilt = built' True -built' :: Bool -> DiskImageConfig -> (FilePath -> Chroot) -> DiskImageFinalization -> RevertableProperty -built' rebuild c mkchroot final = undefined +built' :: Bool -> (FilePath -> Chroot) -> MkPartTable -> DiskImageFinalization -> RevertableProperty +built' rebuild mkparttable mkchroot final = undefined + +-- | Where a partition is mounted. Use Nothing for eg, LinuxSwap. +type MountPoint = Maybe FilePath + +-- | This is provided with a list of the sizes of directories in the chroot +-- under each mount point. The input list corresponds to the list of mount +-- points that the function returns! This trick is accomplished by +-- 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) + +-- TODO tie the knot +-- let f = fitChrootSize MSDOS [(Just "/", mkPartition EXT2)] +-- let (mnts, t) = f (map (MegaBytes . fromIntegral . length . show) mnts) -data DiskImageConfig = DiskImageConfig - { freeSpace :: MegaBytes -- ^ A disk image is sized to fit the system installed in it. This adds some extra free space. (mempty default: 256 Megabytes) - } +-- | The constructor for each Partition is passed the size of the files +-- from the chroot that will be put in that partition. +-- +-- 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 tt l basesizes = (mounts, parttable) + where + (mounts, sizers) = unzip l + parttable = PartTable tt (map (uncurry id) (zip sizers basesizes)) -instance Monoid DiskImageConfig where - mempty = DiskImageConfig (MegaBytes 256) - mappend a b = a - { freeSpace = freeSpace a <> freeSpace b - } +-- | After populating the partitions with files from the chroot, +-- they will have remaining free space equal to the sizes of the input +-- partitions. +freeSpace :: TableType -> [(MountPoint, Partition)] -> MkPartTable +freeSpace tt = fitChrootSize tt . map (\(mnt, p) -> (mnt, adjustsz p)) + where + adjustsz p basesize = p { partSize = partSize p <> basesize } --- | This is a property that is run, chrooted into the disk image. It's --- typically only used to set up the boot loader. -type DiskImageFinalization = Property NoInfo +-- | A pair of properties. The first property is satisfied within the +-- chroot, and is typically used to download the boot loader. +-- The second property is satisfied chrooted into the resulting +-- disk image, and will typically take care of installing the boot loader +-- to the disk image. +type DiskImageFinalization = (Property NoInfo, Property NoInfo) -- | Makes grub be the boot loader of the disk image. --- --- This does not cause grub to be installed. Use `Grub.installed` when --- setting up the Chroot to do that. -grubBooted :: DiskImageFinalization -grubBooted = undefined +grubBooted :: Grub.BIOS -> DiskImageFinalization +grubBooted bios = (Grub.installed bios, undefined) -- cgit v1.2.3