From 5710889607e83fd00b4547bb6855c46a21f5b52e Mon Sep 17 00:00:00 2001 From: Carl George Date: Jan 09 2021 00:41:10 +0000 Subject: Rebase patch104 --- diff --git a/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch b/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch index 687f3a4..5c7ead4 100644 --- a/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch +++ b/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch @@ -1,17 +1,17 @@ -From 4dd22c6aad986c49c313999332c3791d581a1e92 Mon Sep 17 00:00:00 2001 +From 646ea4b2d75712f83086b9ca7b06bf543158c169 Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Thu, 25 Jun 2020 18:10:13 -0500 Subject: [PATCH] Add product data for CentOS Stream --- data/product.d/centos-stream.conf | 7 +++++++ - tests/nosetests/pyanaconda_tests/product_test.py | 4 ++++ - 2 files changed, 11 insertions(+) + tests/nosetests/pyanaconda_tests/product_test.py | 5 +++++ + 2 files changed, 12 insertions(+) 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 000000000..c65fcbbdf +index 0000000000..c65fcbbdf8 --- /dev/null +++ b/data/product.d/centos-stream.conf @@ -0,0 +1,7 @@ @@ -23,20 +23,21 @@ index 000000000..c65fcbbdf +[Base Product] +product_name = CentOS Linux diff --git a/tests/nosetests/pyanaconda_tests/product_test.py b/tests/nosetests/pyanaconda_tests/product_test.py -index f2203f431..5967141bc 100644 +index 55f3e0dde7..d0c3adb849 100644 --- a/tests/nosetests/pyanaconda_tests/product_test.py +++ b/tests/nosetests/pyanaconda_tests/product_test.py -@@ -118,6 +118,10 @@ class ProductConfigurationTestCase(unittest.TestCase): - "CentOS Linux", "", - ["rhel.conf", "centos.conf"] +@@ -244,6 +244,11 @@ class ProductConfigurationTestCase(unittest.TestCase): + ["rhel.conf", "centos.conf"], + WORKSTATION_PARTITIONING ) + self._check_default_product( + "CentOS Stream", "", -+ ["rhel.conf", "centos.conf", "centos-stream.conf"] ++ ["rhel.conf", "centos.conf", "centos-stream.conf"], ++ WORKSTATION_PARTITIONING + ) self._check_default_product( "Red Hat Virtualization", "", - ["rhel.conf", "rhev.conf"] + ["rhel.conf", "rhev.conf"], -- -2.26.2 +2.29.2