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

Merge remote-tracking branch 'qubesos/pr/13'

Browse Source 
* qubesos/pr/13:
  Remove coreboot detection, add skip_grub parameter
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-05 21:30:49 +02:00
commit f1c844098a
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
anaconda/pyanaconda/bootloader.py
View File

@ -1418,13 +1418,9 @@ class GRUB2(GRUB):
def __init__(self): def __init__(self):
super(GRUB2, self).__init__() super(GRUB2, self).__init__()
if subprocess.check_output( self.encryption_support = True
['dmidecode', '-s', 'bios-vendor'], self.stage2_format_types += ["lvmlv"]
universal_newlines=True) == "coreboot\n": self.skip_bootloader = flags.cmdline.getbool("skip_grub", False)
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