From 4b022aad01b3204c66c93c48f41d875d9669c6c4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 23 2020 06:08:00 +0000 Subject: import anaconda-33.16.3.26-1.el8 --- diff --git a/.anaconda.metadata b/.anaconda.metadata index 78d47b2..706f43c 100644 --- a/.anaconda.metadata +++ b/.anaconda.metadata @@ -1 +1 @@ -bb40195a1228171099546a3357695ee654e56a6c SOURCES/anaconda-33.16.3.25.tar.bz2 +ac88148a627674029887fd6e5a8a7c3d05985096 SOURCES/anaconda-33.16.3.26.tar.bz2 diff --git a/.gitignore b/.gitignore index 34cd965..13cf230 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/anaconda-33.16.3.25.tar.bz2 +SOURCES/anaconda-33.16.3.26.tar.bz2 diff --git a/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch b/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch deleted file mode 100644 index 687f3a4..0000000 --- a/SOURCES/0001-Add-product-data-for-CentOS-Stream.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4dd22c6aad986c49c313999332c3791d581a1e92 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(+) - 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 ---- /dev/null -+++ b/data/product.d/centos-stream.conf -@@ -0,0 +1,7 @@ -+# Anaconda configuration file for CentOS Stream. -+ -+[Product] -+product_name = CentOS Stream -+ -+[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 ---- 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"] - ) -+ self._check_default_product( -+ "CentOS Stream", "", -+ ["rhel.conf", "centos.conf", "centos-stream.conf"] -+ ) - self._check_default_product( - "Red Hat Virtualization", "", - ["rhel.conf", "rhev.conf"] --- -2.26.2 - diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 6fe18bc..81306a8 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -1,6 +1,6 @@ Summary: Graphical system installer Name: anaconda -Version: 33.16.3.25 +Version: 33.16.3.26 Release: 1%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -12,9 +12,6 @@ URL: http://fedoraproject.org/wiki/Anaconda # make dist Source0: %{name}-%{version}.tar.bz2 -# https://github.com/rhinstaller/anaconda/pull/2689 -Patch104: 0001-Add-product-data-for-CentOS-Stream.patch - # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -267,9 +264,6 @@ runtime on NFS/HTTP/FTP servers or local disks. %prep %autosetup -p 1 -# debranding -sed -e 's/RHEL/CentOS/' -i po/*.po - %build # use actual build-time release number, not tarball creation time release number %configure ANACONDA_RELEASE=%{release} @@ -372,6 +366,10 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog +* Tue Sep 22 2020 Radek Vykydal - 33.16.3.26-1 +- Never mount partitions on a disk with the iso9660 filesystem (vponcova) + Resolves: rhbz#1878784 + * Thu Sep 17 2020 Radek Vykydal - 33.16.3.25-1 - Root password is mandatory if there is *not* admin user. (rvykydal) Related: rhbz#1876727