0016-Use-installer-kernel-parameters-as-default-for-insta.patch

From 6186778acd90b5950a30bccebbcd0db7c0279b23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Pierret=20=28fepitre=29?=
 <frederic.pierret@qubes-os.org>
Date: Sun, 15 Dec 2019 18:39:15 +0100
Subject: [PATCH] Use installer kernel parameters as default for installed

This way if any kernel parameter was needed to boot Qubes on particular hardware, it will also be set to installed system

Fixes QubesOS/qubes-issues#1650

Adapted from a98ba275162937a56f7ca1ee5428b00de883677a
---
 pyanaconda/modules/storage/bootloader/base.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pyanaconda/modules/storage/bootloader/base.py b/pyanaconda/modules/storage/bootloader/base.py
index ff527836d6..49938acb9b 100644
--- a/pyanaconda/modules/storage/bootloader/base.py
+++ b/pyanaconda/modules/storage/bootloader/base.py
@@ -920,11 +920,17 @@ class BootLoader(object):
 
     def _preserve_some_boot_args(self):
         """Preserve some of the boot args."""
-        for opt in conf.bootloader.preserved_arguments:
-            if opt not in kernel_arguments:
+        global_no_preserve_args = ["stage2", "root", "rescue", "rd.live.check",
+                                   "ip", "repo", "ks", "rd.md", "rd.luks",
+                                   "rd.dm", "rd.lvm.lv", "rd.lvm", "rd.neednet",
+                                   "rd.net.dhcp.vendor-class", "rd.driver.pre",
+                                   "rd.live.overlay.overlayfs", "x86_64"]
+        for opt, arg in kernel_arguments.items():
+            if opt in global_no_preserve_args:
                 continue
+            if opt == os.uname().release:
+                continue
 
-            arg = kernel_arguments.get(opt)
             new_arg = opt
             if arg:
                 new_arg += "=%s" % arg
-- 
2.45.2