From 654350e5e6c2f5f5150c99d2f98e8065b0c6ccb5 Mon Sep 17 00:00:00 2001
From: t_feng <fengtao40@huawei.com>
Date: Fri, 29 Oct 2021 15:49:42 +0800
Subject: [PATCH] fix boot options generated by dracut modules

---
 anaconda.spec                                 |  9 ++-
 ...t-options-generated-by-dracut-module.patch | 56 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 backport-fix-boot-options-generated-by-dracut-module.patch

diff --git a/anaconda.spec b/anaconda.spec
index e601a3f..6ea0893 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -4,7 +4,7 @@
 %endif
 Name:    anaconda
 Version: 33.19
-Release: 28
+Release: 29
 Summary: Graphical system installer
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -117,6 +117,7 @@ Patch6073:    bugfix-Fix-issue-when-ns_info-cannot-be-retrieved-for-NVDim.patch
 Patch6074:    bugfix-Fix-SECTION-headers-in-docstrings.patch
 Patch6075:    change-inst-repo-default-value.patch
 Patch6076:    delete-datezone-map.patch
+Patch6077:    backport-fix-boot-options-generated-by-dracut-module.patch
 
 %define dbusver 1.2.3
 %define dnfver 3.6.0
@@ -332,6 +333,12 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Oct 29 2021 fengtao <fengtao40@huawei.com> - 33.19-29
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix boot options generated by dracut module
+
 * Mon Aug 23 2021 wangce <wangce@uniontech.com> - 33.19-28
 - Type:bugfix
 - ID:NA
diff --git a/backport-fix-boot-options-generated-by-dracut-module.patch b/backport-fix-boot-options-generated-by-dracut-module.patch
new file mode 100644
index 0000000..abf3990
--- /dev/null
+++ b/backport-fix-boot-options-generated-by-dracut-module.patch
@@ -0,0 +1,56 @@
+From a807e0095d7c89e47735cd9caa1a19a1489165c4 Mon Sep 17 00:00:00 2001
+From: Vendula Poncova <vponcova@redhat.com>
+Date: Fri, 29 Oct 2021 15:36:40 +0800
+Subject: [PATCH] fix boot options generated by dracut module
+
+Add the inst. prefix to the anaconda boot options
+
+---
+ dracut/parse-kickstart                               | 4 ++--
+ tests/nosetests/dracut_tests/parse-kickstart_test.py | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
+index 9b55ad6..63e71de 100755
+--- a/dracut/parse-kickstart
++++ b/dracut/parse-kickstart
+@@ -171,7 +171,7 @@ class DracutURL(Url, DracutArgsMixin):
+         if self.noverifyssl:
+             args.append("rd.noverifyssl")
+         if self.proxy:
+-            args.append("proxy=%s" % self.proxy)
++            args.append("inst.proxy=%s" % self.proxy)
+ 
+         return "\n".join(args)
+ 
+@@ -267,7 +267,7 @@ class DracutDisplayMode(DisplayMode, DracutArgsMixin):
+ class DracutBootloader(Bootloader, DracutArgsMixin):
+     def dracut_args(self, args, lineno, obj):
+         if self.extlinux:
+-            return "extlinux"
++            return "inst.extlinux"
+ 
+ # FUTURE: keymap, lang... device? selinux?
+ 
+diff --git a/tests/nosetests/dracut_tests/parse-kickstart_test.py b/tests/nosetests/dracut_tests/parse-kickstart_test.py
+index 9a5cdcd..4dd37c7 100644
+--- a/tests/nosetests/dracut_tests/parse-kickstart_test.py
++++ b/tests/nosetests/dracut_tests/parse-kickstart_test.py
+@@ -94,7 +94,7 @@ class ParseKickstartTestCase(BaseTestCase):
+         self.assertEqual(len(lines), 3, lines)
+         self.assertEqual(lines[0], "inst.repo=https://host.at.foo.com/path/to/tree", lines)
+         self.assertEqual(lines[1], "rd.noverifyssl", lines)
+-        self.assertEqual(lines[2], "proxy=http://localhost:8123", lines)
++        self.assertEqual(lines[2], "inst.proxy=http://localhost:8123", lines)
+ 
+     def updates_test(self):
+         with tempfile.NamedTemporaryFile(mode="w+t") as ks_file:
+@@ -344,4 +344,4 @@ network --device=lo --vlanid=171 --interfacename=vlan171
+             ks_file.flush()
+             lines = self.execParseKickstart(ks_file.name)
+ 
+-            self.assertEqual(lines[0], "extlinux", lines)
++            self.assertEqual(lines[0], "inst.extlinux", lines)
+-- 
+2.23.0
+