Sync from SUSE:SLFO:Main cockpit revision 98f4b8f4b24204a7de5723c189bfa60a

This commit is contained in:
Adrian Schröter 2024-08-27 10:43:15 +02:00
parent c11772a2b2
commit 9b0390183a
3 changed files with 18 additions and 0 deletions

View File

@ -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]

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 20 11:44:33 UTC 2024 - Alice Brooks <alice.brooks@suse.com>
- add 0005-cockpit-ws-user-remove-default-deps.patch (bsc#1229146)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 8 12:21:51 UTC 2024 - Jan Zerebecki <jan.suse@zerebecki.de> Thu Aug 8 12:21:51 UTC 2024 - Jan Zerebecki <jan.suse@zerebecki.de>

View File

@ -73,6 +73,7 @@ Patch102: 0002-selinux-temporary-remove-setroubleshoot-section.patch
Patch103: 0004-leap-gnu18-removal.patch Patch103: 0004-leap-gnu18-removal.patch
Patch104: selinux_libdir.patch Patch104: selinux_libdir.patch
Patch105: fix-libexecdir.patch Patch105: fix-libexecdir.patch
Patch106: 0005-cockpit-ws-user-remove-default-deps.patch
%define build_all 1 %define build_all 1
%if 0%{?rhel} == 8 && 0%{?epel} == 0 && !0%{?build_all} %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 3 -p1
%patch -P 4 -p1 %patch -P 4 -p1
%patch -P 5 -p1 %patch -P 5 -p1
%patch -P 106 -p1
# SLE Micro specific patches # SLE Micro specific patches
%if 0%{?is_smo} %if 0%{?is_smo}