From 9c7837a6ec20a79e925ace93deadea7e1c67b5c8 Mon Sep 17 00:00:00 2001 From: Rusty Bird Date: Mon, 1 May 2017 11:47:57 +0000 Subject: [PATCH] Remove coreboot detection, add skip_grub parameter And unconditionally allow boot encryption and the lvmlv format. (The user still has to fight the installer to actually set it up.) Fixes QubesOS/qubes-issues#2553 (cherry picked from commit 62cb1ca1e6b0b6a133e3f1bd188e306e2a1f9624) --- anaconda/pyanaconda/bootloader.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/anaconda/pyanaconda/bootloader.py b/anaconda/pyanaconda/bootloader.py index 0a53940..20e153b 100644 --- a/anaconda/pyanaconda/bootloader.py +++ b/anaconda/pyanaconda/bootloader.py @@ -1419,13 +1419,9 @@ class GRUB2(GRUB): def __init__(self): 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"] + self.encryption_support = True + self.stage2_format_types += ["lvmlv"] + self.skip_bootloader = flags.cmdline.getbool("skip_grub", False) # 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