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