From 763098db0e1a8771e329be694f0b238356cdf991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Fri, 5 Feb 2016 02:22:00 +0100 Subject: [PATCH] anaconda: use installer kernel parameters as default for installed system This way if any kernel parameter was need to boot Qubes on particular hardware, it will also be set to installed system Fixes QubesOS/qubes-issues#1650 --- anaconda/pyanaconda/bootloader.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/anaconda/pyanaconda/bootloader.py b/anaconda/pyanaconda/bootloader.py index cd28d32..0beed18 100644 --- a/anaconda/pyanaconda/bootloader.py +++ b/anaconda/pyanaconda/bootloader.py @@ -243,12 +243,10 @@ class BootLoader(object): def stage2_format_types(self): return ["ext4", "ext3", "ext2"] - # this is so stupid... - global_preserve_args = ["speakup_synth", "apic", "noapic", "apm", "ide", - "noht", "acpi", "video", "pci", "nodmraid", - "nompath", "nomodeset", "noiswmd", "fips", - "selinux", "biosdevname"] - preserve_args = [] + global_no_preserve_args = ["inst.stage2", "root", "rescue", + "rd.live.check", "ip", "repo", "ks", + "rd.lvm", "rd.md", "rd.luks", "rd.dm", + "rd.lvm.lv"] _trusted_boot = False @@ -861,11 +859,10 @@ class BootLoader(object): self.boot_args.add("ifname=%s:%s" % (nic, hwaddr.lower())) # - # preservation of some of our boot args - # FIXME: this is stupid. + # preservation of most of our boot args # - for opt in self.global_preserve_args + self.preserve_args: - if opt not in flags.cmdline: + for opt in flags.cmdline.keys(): + if opt in self.global_no_preserve_args: continue arg = flags.cmdline.get(opt)