Skip to content

Commit

Permalink
anaconda: don't force non-encrypted /boot on coreboot systems
Browse files Browse the repository at this point in the history
With grub payload it is possible to have all the partitions encrypted.

Based on patch by @tlaurion

Fixes QubesOS/qubes-issues#2118
  • Loading branch information
fepitre committed Sep 20, 2017
1 parent 3c257fe commit f4778e4
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions pyanaconda/bootloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
from pyanaconda.i18n import _, N_

import logging
import subprocess

log = logging.getLogger("anaconda")

class serial_opts(object):
Expand Down Expand Up @@ -1414,12 +1416,11 @@ class GRUB2(GRUB):
# XXX we probably need special handling for raid stage1 w/ gpt disklabel
# since it's unlikely there'll be a bios boot partition on each disk

@property
def stage2_format_types(self):
if productName.startswith("Red Hat "): # pylint: disable=no-member
return ["xfs", "ext4", "ext3", "ext2", "btrfs"]
else:
return ["ext4", "ext3", "ext2", "btrfs", "xfs"]
stage2_format_types = ["ext4", "ext3", "ext2", "btrfs", "xfs"]

self.encryption_support = True
self.stage2_format_types += ["lvmlv"]
self.skip_bootloader = flags.cmdline.getbool("skip_grub", False)

#
# grub-related conveniences
Expand Down

0 comments on commit f4778e4

Please sign in to comment.