summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Installer/Target.hs
diff options
context:
space:
mode:
authorJoey Hess2018-01-06 14:48:34 -0400
committerJoey Hess2018-01-06 14:48:34 -0400
commitbc6045c8b5333ac5d407e8f4b96bb0d9f50dfa9a (patch)
tree303bf5f1e584e58a31bfb45f6b8c714b2e3d622e /src/Propellor/Property/Installer/Target.hs
parent48196467d11a856f411208ba5eadb20dd9455c10 (diff)
changes to allow GPT BIOS boot partitions
* Parted: Allow partitions to have no filesystem, for eg, GPT BIOS boot partitions. (API change) * Added rawPartition to PartSpec, for specifying partitions with no filesystem. * Added BiosGrubFlag to PartFlag. Note that man parted does not list the "bios_boot" flag, but I found it in its html documentation. Other flags may also be missing. This commit was sponsored by Boyd Stephen Smith Jr. on Patreon.
Diffstat (limited to 'src/Propellor/Property/Installer/Target.hs')
-rw-r--r--src/Propellor/Property/Installer/Target.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Installer/Target.hs b/src/Propellor/Property/Installer/Target.hs
index 62ec4082..80e660ad 100644
--- a/src/Propellor/Property/Installer/Target.hs
+++ b/src/Propellor/Property/Installer/Target.hs
@@ -246,10 +246,10 @@ fstabLists userinput (TargetPartTable _ partspecs) = setup <!> doNothing
partitions = map (\(mp, _, mkpart, _) -> (mp, mkpart mempty)) partspecs
mnts = mapMaybe fst $
- filter (\(_, p) -> partFs p /= LinuxSwap) partitions
+ filter (\(_, p) -> partFs p /= Just LinuxSwap && partFs p /= Nothing) partitions
swaps targetdev =
map (Fstab.SwapPartition . diskPartition targetdev . snd) $
- filter (\((_, p), _) -> partFs p == LinuxSwap)
+ filter (\((_, p), _) -> partFs p == Just LinuxSwap)
(zip partitions partNums)
-- | Make the target bootable using whatever bootloader is installed on it.