summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/DiskImage.hs
diff options
context:
space:
mode:
authorJoey Hess2018-10-13 20:44:44 -0400
committerJoey Hess2018-10-13 20:44:44 -0400
commit85ae22f03996b2e1ff609e08fb514824878947ef (patch)
treefd21c784bed90ffda5a7fee75523dd31b8d92201 /src/Propellor/Property/DiskImage.hs
parentf0b5074f107d1da2043701894254f7e85b090331 (diff)
parented118fb909ff5d5f5d030570878bdb1c0fe0ff18 (diff)
Merge remote-tracking branch 'remotes/bremner/proposed/direct-boot'
Diffstat (limited to 'src/Propellor/Property/DiskImage.hs')
-rw-r--r--src/Propellor/Property/DiskImage.hs4
1 files changed, 4 insertions, 0 deletions
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