netgod / rpms / anaconda

Forked from rpms/anaconda 2 years ago
Clone
161635
From cf1a449f229217f169d61f65b9719b9923aa02df Mon Sep 17 00:00:00 2001
618a05
From: Pat Riehecky <riehecky@fnal.gov>
618a05
Date: Mon, 23 Nov 2020 13:50:06 -0600
161635
Subject: [PATCH 1/3] Add CentOS Stream config
618a05
618a05
https://github.com/rhinstaller/anaconda/pull/3014
618a05
https://github.com/rhinstaller/anaconda/commit/150bbc179cf51226d6c1bd46279e076ff683ec03
618a05
---
618a05
 data/product.d/centos-stream.conf             | 33 +++++++++++++++++++
618a05
 data/product.d/centos.conf                    | 28 +---------------
618a05
 .../pyanaconda_tests/product_test.py          |  9 +++--
618a05
 3 files changed, 41 insertions(+), 29 deletions(-)
618a05
 create mode 100644 data/product.d/centos-stream.conf
618a05
618a05
diff --git a/data/product.d/centos-stream.conf b/data/product.d/centos-stream.conf
618a05
new file mode 100644
618a05
index 0000000000..79d13392af
618a05
--- /dev/null
618a05
+++ b/data/product.d/centos-stream.conf
618a05
@@ -0,0 +1,33 @@
618a05
+# Anaconda configuration file for CentOS Stream.
618a05
+
618a05
+[Product]
618a05
+product_name = CentOS Stream
618a05
+
618a05
+[Base Product]
618a05
+product_name = Red Hat Enterprise Linux
618a05
+
618a05
+[Anaconda]
618a05
+# List of enabled Anaconda DBus modules for RHEL.
618a05
+#  but without org.fedoraproject.Anaconda.Modules.Subscription
618a05
+kickstart_modules =
618a05
+    org.fedoraproject.Anaconda.Modules.Timezone
618a05
+    org.fedoraproject.Anaconda.Modules.Network
618a05
+    org.fedoraproject.Anaconda.Modules.Localization
618a05
+    org.fedoraproject.Anaconda.Modules.Security
618a05
+    org.fedoraproject.Anaconda.Modules.Users
618a05
+    org.fedoraproject.Anaconda.Modules.Payloads
618a05
+    org.fedoraproject.Anaconda.Modules.Storage
618a05
+    org.fedoraproject.Anaconda.Modules.Services
618a05
+
618a05
+[Bootloader]
618a05
+efi_dir = centos
618a05
+
618a05
+[User Interface]
618a05
+help_directory = /usr/share/anaconda/help/centos
618a05
+default_help_pages =
618a05
+    centos_help_placeholder.txt
618a05
+    centos_help_placeholder.xml
618a05
+    centos_help_placeholder.xml
618a05
+
618a05
+[Payload]
618a05
+default_source = CLOSEST_MIRROR
618a05
diff --git a/data/product.d/centos.conf b/data/product.d/centos.conf
618a05
index 9490e038a9..dcf22c3f9d 100644
618a05
--- a/data/product.d/centos.conf
618a05
+++ b/data/product.d/centos.conf
618a05
@@ -4,30 +4,4 @@
618a05
 product_name = CentOS Linux
618a05
 
618a05
 [Base Product]
618a05
-product_name = Red Hat Enterprise Linux
618a05
-
618a05
-[Anaconda]
618a05
-# List of enabled Anaconda DBus modules for RHEL.
618a05
-#  but without org.fedoraproject.Anaconda.Modules.Subscription
618a05
-kickstart_modules =
618a05
-     org.fedoraproject.Anaconda.Modules.Timezone
618a05
-     org.fedoraproject.Anaconda.Modules.Network
618a05
-     org.fedoraproject.Anaconda.Modules.Localization
618a05
-     org.fedoraproject.Anaconda.Modules.Security
618a05
-     org.fedoraproject.Anaconda.Modules.Users
618a05
-     org.fedoraproject.Anaconda.Modules.Payloads
618a05
-     org.fedoraproject.Anaconda.Modules.Storage
618a05
-     org.fedoraproject.Anaconda.Modules.Services
618a05
-
618a05
-[Bootloader]
618a05
-efi_dir = centos
618a05
-
618a05
-[User Interface]
618a05
-help_directory = /usr/share/anaconda/help/centos
618a05
-default_help_pages =
618a05
-    centos_help_placeholder.txt
618a05
-    centos_help_placeholder.xml
618a05
-    centos_help_placeholder.xml
618a05
-
618a05
-[Payload]
618a05
-default_source = CLOSEST_MIRROR
618a05
+product_name = CentOS Stream
618a05
diff --git a/tests/nosetests/pyanaconda_tests/product_test.py b/tests/nosetests/pyanaconda_tests/product_test.py
618a05
index 55f3e0dde7..45d532bda1 100644
618a05
--- a/tests/nosetests/pyanaconda_tests/product_test.py
618a05
+++ b/tests/nosetests/pyanaconda_tests/product_test.py
618a05
@@ -239,9 +239,14 @@ class ProductConfigurationTestCase(unittest.TestCase):
618a05
             ["rhel.conf"],
618a05
             WORKSTATION_PARTITIONING
618a05
         )
618a05
+        self._check_default_product(
618a05
+            "CentOS Stream", "",
618a05
+            ["rhel.conf", "centos-stream.conf"],
618a05
+            WORKSTATION_PARTITIONING
618a05
+        )
618a05
         self._check_default_product(
618a05
             "CentOS Linux", "",
618a05
-            ["rhel.conf", "centos.conf"],
618a05
+            ["rhel.conf", "centos-stream.conf", "centos.conf"],
618a05
             WORKSTATION_PARTITIONING
618a05
         )
618a05
         self._check_default_product(
618a05
@@ -251,7 +256,7 @@ class ProductConfigurationTestCase(unittest.TestCase):
618a05
         )
618a05
         self._check_default_product(
618a05
             "oVirt Node Next", "",
618a05
-            ["rhel.conf", "centos.conf", "ovirt.conf"],
618a05
+            ["rhel.conf", "centos-stream.conf", "centos.conf", "ovirt.conf"],
618a05
             VIRTUALIZATION_PARTITIONING
618a05
         )
618a05
         self._check_default_product(
618a05
-- 
161635
2.30.2
618a05