QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

anaconda: don't force non-encrypted /boot on coreboot systems

Browse Source 
With grub payload it is possible to have all the partitions encrypted.

Based on patch by @tlaurion

Fixes QubesOS/qubes-issues#2118
This commit is contained in:
Marek Marczykowski-Górecki 2016-07-14 04:15:50 +02:00
parent d8fab041cf
commit 147941657f
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
anaconda/anaconda.spec
View File

@ -130,6 +130,7 @@ Requires: hfsplus-tools
%endif %endif
%endif %endif
Requires: python3-pid Requires: python3-pid
Requires: dmidecode
Requires: python3-coverage Requires: python3-coverage

17
anaconda/pyanaconda/bootloader.py
View File

@ -46,6 +46,8 @@ from pyanaconda.i18n import _, N_
from pyanaconda.orderedset import OrderedSet from pyanaconda.orderedset import OrderedSet
import logging import logging
import subprocess
log = logging.getLogger("anaconda") log = logging.getLogger("anaconda")
class serial_opts(object): class serial_opts(object):
@ -1412,16 +1414,19 @@ class GRUB2(GRUB):
raid.RAID5, raid.RAID6, raid.RAID10] raid.RAID5, raid.RAID6, raid.RAID10]
stage2_raid_metadata = ["0", "0.90", "1.0", "1.2"] stage2_raid_metadata = ["0", "0.90", "1.0", "1.2"]
@property stage2_format_types = ["ext4", "ext3", "ext2", "btrfs", "xfs"]
def stage2_format_types(self):
if productName.startswith("Red Hat "):
return ["xfs", "ext4", "ext3", "ext2", "btrfs"]
else:
return ["ext4", "ext3", "ext2", "btrfs", "xfs"]
def __init__(self): def __init__(self):
super(GRUB2, self).__init__() super(GRUB2, self).__init__()
if subprocess.check_output(
['dmidecode', '-s', 'bios-vendor'],
universal_newlines=True) == "coreboot\n":
log.info("dmidecode -s bios-vendor returns coreboot")
self.encryption_support = True
self.skip_bootloader = True
self.stage2_format_types += ["lvmlv"]
# XXX we probably need special handling for raid stage1 w/ gpt disklabel # 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 # since it's unlikely there'll be a bios boot partition on each disk