From ed118fb909ff5d5f5d030570878bdb1c0fe0ff18 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 7 Oct 2018 22:15:31 -0300 Subject: add DirectBoot finalization Eventually this should perhaps copy the kernel and initrd out of the chroot. --- src/Propellor/Property/DiskImage.hs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Propellor/Property/DiskImage.hs b/src/Propellor/Property/DiskImage.hs index 289de151..a41af18c 100644 --- a/src/Propellor/Property/DiskImage.hs +++ b/src/Propellor/Property/DiskImage.hs @@ -228,6 +228,7 @@ imageBuilt' rebuild img mkchroot tabletype partspec = ubootFlashKernelFinalized p [FlashKernelInstalled, UbootInstalled p] -> ubootFlashKernelFinalized p + [DirectBoot] -> directBootFinalized _ -> unbootable "multiple bootloaders are installed; don't know which to use" -- | This property is automatically added to the chroot when building a @@ -469,6 +470,9 @@ grubFinalized grubtarget _img mnt loopdevs = ubootFinalized :: (FilePath -> FilePath -> Property Linux) -> Finalization ubootFinalized p (RawDiskImage img) mnt _loopdevs = p img mnt +directBootFinalized :: Finalization +directBootFinalized _img _mnt _loopDevs = doNothing + flashKernelFinalized :: Finalization flashKernelFinalized _img mnt _loopdevs = FlashKernel.flashKernelMounted mnt -- cgit v1.2.3