From 9b0390183a2f428c163a7990b160a9131fd4bc738cd6a5214cddc185a503d220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 27 Aug 2024 10:43:15 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main cockpit revision 98f4b8f4b24204a7de5723c189bfa60a --- 0005-cockpit-ws-user-remove-default-deps.patch | 11 +++++++++++ cockpit.changes | 5 +++++ cockpit.spec | 2 ++ 3 files changed, 18 insertions(+) create mode 100644 0005-cockpit-ws-user-remove-default-deps.patch diff --git a/0005-cockpit-ws-user-remove-default-deps.patch b/0005-cockpit-ws-user-remove-default-deps.patch new file mode 100644 index 0000000..c44d77e --- /dev/null +++ b/0005-cockpit-ws-user-remove-default-deps.patch @@ -0,0 +1,11 @@ +--- pkg/src/systemd/cockpit-ws-user.service ++++ pkg/src/systemd/cockpit-ws-user.service +@@ -1,6 +1,8 @@ + [Unit] + Description=Dynamic user for cockpit-ws + Documentation=man:cockpit-ws(8) ++# avoid dependency loop with basic.target/sockets.target shutdown ++DefaultDependencies=no + BindsTo=cockpit.service + + [Service] diff --git a/cockpit.changes b/cockpit.changes index 93dbd92..ff8636d 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 20 11:44:33 UTC 2024 - Alice Brooks + +- add 0005-cockpit-ws-user-remove-default-deps.patch (bsc#1229146) + ------------------------------------------------------------------- Thu Aug 8 12:21:51 UTC 2024 - Jan Zerebecki diff --git a/cockpit.spec b/cockpit.spec index 8c7bfd9..615dac3 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -73,6 +73,7 @@ Patch102: 0002-selinux-temporary-remove-setroubleshoot-section.patch Patch103: 0004-leap-gnu18-removal.patch Patch104: selinux_libdir.patch Patch105: fix-libexecdir.patch +Patch106: 0005-cockpit-ws-user-remove-default-deps.patch %define build_all 1 %if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all} @@ -223,6 +224,7 @@ BuildRequires: python3-tox-current-env %patch -P 3 -p1 %patch -P 4 -p1 %patch -P 5 -p1 +%patch -P 106 -p1 # SLE Micro specific patches %if 0%{?is_smo}