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

anaconda: use installer kernel parameters as default for installed system

Browse Source 
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
This commit is contained in:
Marek Marczykowski-Górecki 2016-02-05 02:22:00 +01:00
parent dee1bfd3cb
commit 763098db0e
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
anaconda/pyanaconda/bootloader.py
View File

@ -243,12 +243,10 @@ class BootLoader(object):
def stage2_format_types(self): def stage2_format_types(self):
return ["ext4", "ext3", "ext2"] return ["ext4", "ext3", "ext2"]
# this is so stupid... global_no_preserve_args = ["inst.stage2", "root", "rescue",
global_preserve_args = ["speakup_synth", "apic", "noapic", "apm", "ide", "rd.live.check", "ip", "repo", "ks",
"noht", "acpi", "video", "pci", "nodmraid", "rd.lvm", "rd.md", "rd.luks", "rd.dm",
"nompath", "nomodeset", "noiswmd", "fips", "rd.lvm.lv"]
"selinux", "biosdevname"]
preserve_args = []
_trusted_boot = False _trusted_boot = False
@ -861,11 +859,10 @@ class BootLoader(object):
self.boot_args.add("ifname=%s:%s" % (nic, hwaddr.lower())) self.boot_args.add("ifname=%s:%s" % (nic, hwaddr.lower()))
# #
# preservation of some of our boot args # preservation of most of our boot args
# FIXME: this is stupid.
# #
for opt in self.global_preserve_args + self.preserve_args: for opt in flags.cmdline.keys():
if opt not in flags.cmdline: if opt in self.global_no_preserve_args:
continue continue
arg = flags.cmdline.get(opt) arg = flags.cmdline.get(opt)