From 3877100b548fecb81dd3fdc08fbdaed36944f3d8 Mon Sep 17 00:00:00 2001
From: Radek Vykydal <rvykydal@redhat.com>
Date: Apr 12 2021 16:17:07 +0000
Subject: - Make sure rhsm.service is running at Anaconda startup (vponcova)

  Resolves: rhbz#1948371

---

diff --git a/0004-Make-sure-rhsm.service-is-running-at-Anaconda-startu.patch b/0004-Make-sure-rhsm.service-is-running-at-Anaconda-startu.patch
new file mode 100644
index 0000000..5437834
--- /dev/null
+++ b/0004-Make-sure-rhsm.service-is-running-at-Anaconda-startu.patch
@@ -0,0 +1,37 @@
+From 0429dff8063dd65549b676188ef6edea3870a419 Mon Sep 17 00:00:00 2001
+From: Martin Kolman <mkolman@redhat.com>
+Date: Fri, 6 Mar 2020 13:46:22 +0100
+Subject: [PATCH 4/4] Make sure rhsm.service is running at Anaconda startup
+
+Make sure rhsm.service is running at Anaconda startup
+to avoid issues with DBus activation of rhsm.service
+timing out on systems that are slow or under heavy load.
+
+We need both Wants to specify the anaconda.target requires
+the rhsm.service as well as After to make sure it is started
+before all the Anaconda services that just have Wants but
+not After.
+
+If the rhsm.service fails to start or it cannot be added to
+the transaction, anaconda will start anyway.
+
+(cherry picked from commit 1cd68dd)
+
+Resolves: rhbz#1948371
+---
+ data/systemd/anaconda.target | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/data/systemd/anaconda.target b/data/systemd/anaconda.target
+index dab6966a28..12ee15e3a8 100644
+--- a/data/systemd/anaconda.target
++++ b/data/systemd/anaconda.target
+@@ -13,3 +13,5 @@ Wants=anaconda-sshd.service
+ Wants=anaconda-pre.service
+ Wants=anaconda-fips.service
+ Wants=systemd-logind.service
++Wants=rhsm.service
++After=rhsm.service
+-- 
+2.26.3
+
diff --git a/anaconda.spec b/anaconda.spec
index 3530ad2..98b18a9 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,7 +1,7 @@
 Summary: Graphical system installer
 Name:    anaconda
 Version: 34.24.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
 
@@ -21,6 +21,7 @@ Source0: %{name}-%{version}.tar.bz2
 Patch0: 0001-Revert-Remove-support-for-boot-arguments-without-ins.patch
 Patch1: 0002-Revert-Do-not-support-no-inst.-Anaconda-boot-args-in.patch
 Patch2: 0003-Do-not-require-inst.-prefixes-for-Anaconda-boot-argu.patch
+Patch3: 0004-Make-sure-rhsm.service-is-running-at-Anaconda-startu.patch
 %endif
 
 # Versions of required components (done so we make sure the buildrequires
@@ -419,6 +420,11 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
 %{_prefix}/libexec/anaconda/dd_*
 
 %changelog
+
+* Mon Apr 12 2021 Radek Vykydal <rvykydal@redhat.com> - 34.24.8-2
+- Make sure rhsm.service is running at Anaconda startup (vponcova)
+  Resolves: rhbz#1948371
+
 * Wed Mar 31 2021 Martin Kolman <mkolman@redhat.com> - 34.24.8-1
 - ostree: ignore exit code 65 for systemd-tmpfiles (vponcova)
 - Turn off wrapping of the scale values (vponcova)