import OL rpm-ostree-2024.3-5.el9_4

SOURCES/0005-rpm-ostree-fix-shadow-mode.service-don-t-run-if-OS-i.patch

@@ -0,0 +1,27 @@
+From 82cfc5491b3c670dd3d0abc0b30758622c958299 Mon Sep 17 00:00:00 2001
+From: Joseph Marrero Corchado <jmarrero@redhat.com>
+Date: Thu, 2 May 2024 08:57:45 -0400
+Subject: [PATCH] rpm-ostree-fix-shadow-mode.service: don't run if OS is not
+ installed
+
+Co-authored-by: Jonathan Lebon <jonathan@jlebon.com>
+---
+ src/daemon/rpm-ostree-fix-shadow-mode.service | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/daemon/rpm-ostree-fix-shadow-mode.service b/src/daemon/rpm-ostree-fix-shadow-mode.service
+index 121bc74e..f2983032 100644
+--- a/src/daemon/rpm-ostree-fix-shadow-mode.service
++++ b/src/daemon/rpm-ostree-fix-shadow-mode.service
+@@ -7,6 +7,8 @@ Documentation=https://github.com/coreos/rpm-ostree-ghsa-2m76-cwhg-7wv6
+ # the old /etc/.rpm-ostree-shadow-mode-fixed.stamp
+ ConditionPathExists=!/etc/.rpm-ostree-shadow-mode-fixed2.stamp
+ ConditionPathExists=/run/ostree-booted
++# Filter out non-traditional ostree setups (e.g. live boots)
++ConditionKernelCommandLine=ostree
+ # Because we read the sysroot
+ RequiresMountsFor=/boot
+ # Make sure this is started before any unprivileged (interactive) user has access to the system.
+-- 
+2.45.2
+

SPECS/rpm-ostree.spec

@@ -4,7 +4,7 @@
 Summary: Hybrid image/package system
 Name: rpm-ostree
 Version: 2024.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 URL: https://github.com/coreos/rpm-ostree
 # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
@@ -16,6 +16,7 @@ Patch1: 0001-passwd-create-etc-g-shadow-with-mode-0.patch
 Patch2: 0002-unit-chmod-etc-g-shadow-to-0000.patch
 Patch3: 0003-shadow-Adjust-all-deployments.patch
 Patch4: 0004-core-also-wrap-kernel-install-for-scriptlets.patch
+Patch5: 0005-rpm-ostree-fix-shadow-mode.service-don-t-run-if-OS-i.patch
 
 ExclusiveArch: %{rust_arches}
 
@@ -250,6 +251,10 @@ fi
 %files devel -f files.devel
 
 %changelog
+* Tue Aug 20 2024 Huijing Hei <hhei@fedoraproject.org> - 2024.3-5
+- Backport https://github.com/coreos/rpm-ostree/pull/4944
+  Resolves: #RHEL-55249
+
 * Fri May 10 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 2024.3-4
 - Backport https://github.com/coreos/rpm-ostree/pull/4950
   Resolves: #RHEL-36085