diff --git a/.anaconda.metadata b/.anaconda.metadata
index e997f2c..2a5e78f 100644
--- a/.anaconda.metadata
+++ b/.anaconda.metadata
@@ -1 +1 @@
-6a74305c1660dc9754649e8813bd6cf799afd3a3 SOURCES/anaconda-33.16.5.1.tar.bz2
+42186ae93c579b1dfa20f05e7f3f53b2c4812dea SOURCES/anaconda-33.16.5.2.tar.bz2
diff --git a/.gitignore b/.gitignore
index 5a2d744..3f6a7fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/anaconda-33.16.5.1.tar.bz2
+SOURCES/anaconda-33.16.5.2.tar.bz2
diff --git a/SOURCES/0001-Add-CentOS-Stream-config.patch b/SOURCES/0001-Add-CentOS-Stream-config.patch
deleted file mode 100644
index b490c18..0000000
--- a/SOURCES/0001-Add-CentOS-Stream-config.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 06e9970314acd57ffd76c02a1086661f6400be9b Mon Sep 17 00:00:00 2001
-From: Pat Riehecky <riehecky@fnal.gov>
-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.31.1
-
diff --git a/SOURCES/0002-Enable-closest-mirror-in-CentOS-Stream-config.patch b/SOURCES/0002-Enable-closest-mirror-in-CentOS-Stream-config.patch
deleted file mode 100644
index d2159e1..0000000
--- a/SOURCES/0002-Enable-closest-mirror-in-CentOS-Stream-config.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8bae7162344283ade4ee1d08efc5cb1442c6968e Mon Sep 17 00:00:00 2001
-From: Carl George <carl@george.computer>
-Date: Tue, 27 Apr 2021 16:01:21 -0500
-Subject: [PATCH 2/3] Enable closest mirror in CentOS Stream config
-
-Resolves: rhbz#1953698
----
- data/product.d/centos-stream.conf | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/data/product.d/centos-stream.conf b/data/product.d/centos-stream.conf
-index 79d13392af..723a484038 100644
---- a/data/product.d/centos-stream.conf
-+++ b/data/product.d/centos-stream.conf
-@@ -30,4 +30,5 @@ default_help_pages =
- centos_help_placeholder.xml
-
- [Payload]
-+enable_closest_mirror = True
- default_source = CLOSEST_MIRROR
---
-2.31.1
-
diff --git a/SOURCES/0003-Fix-CDN-button-visibility.patch b/SOURCES/0003-Fix-CDN-button-visibility.patch
deleted file mode 100644
index fed1596..0000000
--- a/SOURCES/0003-Fix-CDN-button-visibility.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From f4f5fd58919424a1ff7b397b80c935bd013b2bc2 Mon Sep 17 00:00:00 2001
-From: Martin Kolman <mkolman@redhat.com>
-Date: Fri, 11 Sep 2020 15:27:59 +0200
-Subject: [PATCH 3/3] Fix CDN button visibility
-
-Only show the Red Hat CDN button if the Subscription
-module appears to be running. To achieve that, we do
-the same thing as with the HMC button - the CDN
-button invisible by default. And enable it only if it
-looks like the Subscription module is running.
-
-(cherry picked from commit: aca297587ab8bdd7342fa056273bfff379bc0a0b)
-
-Resolves: rhbz#1903178
-
-https://github.com/rhinstaller/anaconda/pull/3020
-https://github.com/M4rtinK/anaconda/commit/c29802a2be591a4cdcc91ba86b74fc4d01087b72
----
- pyanaconda/ui/gui/spokes/installation_source.glade | 2 +-
- pyanaconda/ui/gui/spokes/installation_source.py | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/pyanaconda/ui/gui/spokes/installation_source.glade b/pyanaconda/ui/gui/spokes/installation_source.glade
-index a23f8be714..e53fa230ca 100644
---- a/pyanaconda/ui/gui/spokes/installation_source.glade
-+++ b/pyanaconda/ui/gui/spokes/installation_source.glade
-@@ -633,9 +633,9 @@
- <child>
- <object class="GtkRadioButton" id="cdnRadioButton">
- <property name="label" translatable="yes" context="GUI|Software Source">Red Hat _CDN</property>
-- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
-+ <property name="no_show_all">True</property>
- <property name="margin_left">12</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
-diff --git a/pyanaconda/ui/gui/spokes/installation_source.py b/pyanaconda/ui/gui/spokes/installation_source.py
-index 6aab9b387a..d0d4da72b9 100644
---- a/pyanaconda/ui/gui/spokes/installation_source.py
-+++ b/pyanaconda/ui/gui/spokes/installation_source.py
-@@ -854,9 +854,9 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler, SourceSwitchHandler):
- def _initialize(self):
- threadMgr.wait(constants.THREAD_PAYLOAD)
-
-- # If there is no Subscriptiopn DBus module, disable the CDN radio button
-+ # If there is the Subscriptiopn DBus module, make the CDN radio button visible
- if is_module_available(SUBSCRIPTION):
-- gtk_call_once(self._cdn_button.set_no_show_all, True)
-+ gtk_call_once(self._cdn_button.set_no_show_all, False)
-
- # Get the current source.
- source_proxy = self.payload.get_source_proxy()
---
-2.31.1
-
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index e765984..822d1ca 100644
--- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec
@@ -1,6 +1,6 @@
Summary: Graphical system installer
Name: anaconda
-Version: 33.16.5.1
+Version: 33.16.5.2
Release: 1%{?dist}
License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda
@@ -12,13 +12,6 @@ URL: http://fedoraproject.org/wiki/Anaconda
# make dist
Source0: %{name}-%{version}.tar.bz2
-# https://github.com/rhinstaller/anaconda/pull/3315
-Patch10001: 0001-Add-CentOS-Stream-config.patch
-Patch10002: 0002-Enable-closest-mirror-in-CentOS-Stream-config.patch
-
-# https://github.com/rhinstaller/anaconda/pull/3020
-Patch10003: 0003-Fix-CDN-button-visibility.patch
-
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@@ -374,6 +367,29 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_*
%changelog
+* Mon May 24 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.5.2-1
+- Use modinfo to check ko before modprobe (t.feng94)
+ Resolves: rhbz#1577544
+- network: do not crash on team without IP config (rvykydal)
+ Resolves: rhbz#1929008
+- Add the "Encrypt my data" checkbox to the custom partitioning spoke
+ (vponcova)
+ Resolves: rhbz#1903786
+- Allow encryption of thin logical volumes (vponcova)
+ Resolves: rhbz#1877777
+- Don't automatically execute the default partitioning (vponcova)
+ Resolves: rhbz#1954408
+- Don't run the execute method in the kickstart installation in TUI by default
+ (vponcova)
+ Related: rhbz#1954408
+- Don't run the execute method in the kickstart installation in GUI by default
+ (vponcova)
+ Related: rhbz#1954408
+- Enable closest mirror in CentOS Stream config (carl)
+ Resolves: rhbz#1953698
+- Add CentOS Stream config (riehecky)
+ Resolves: rhbz#1953698
+
* Wed May 19 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.5.1-1
- subscription: allow dates in ISO 8601 format (ptoscano)
Resolves: rhbz#1947445