From 1dd6f1594310c103db2b18eea72869d02de8d7ed0cc9c114c6fa88c66fdb4f70 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 26 Jun 2023 14:28:56 +0000 Subject: [PATCH 1/3] - file-triggers: fix a typo that sneaked in the script dealing with tmpfiles (bsc#1212733) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1404 --- systemd.changes | 6 ++++++ triggers.systemd | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/systemd.changes b/systemd.changes index 69e7e057..f491cadd 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 26 14:26:28 UTC 2023 - Franck Bui + +- file-triggers: fix a typo that sneaked in the script dealing with tmpfiles + (bsc#1212733) + ------------------------------------------------------------------- Wed Jun 21 10:30:58 UTC 2023 - Franck Bui diff --git a/triggers.systemd b/triggers.systemd index 5a0e6c16..3d1095e5 100644 --- a/triggers.systemd +++ b/triggers.systemd @@ -108,7 +108,7 @@ end -- Note: /run is never mounted during transactional updates. if posix.access("/run/systemd/system") then assert(rpm.execute("systemd-tmpfiles", "--create")) -endf +end %if %{without bootstrap} %transfiletriggerin -P 1000600 -n udev -p -- /usr/lib/udev/rules.d From 781b64a6ba447d3490b959e2d72578920cbd3adc9d1376ca3c2e0daf11c5c710 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 27 Jun 2023 13:08:31 +0000 Subject: [PATCH 2/3] - Change the group owner of /run/lock from "lock" to "root" (bsc#1212674) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1405 --- systemd.changes | 5 +++++ systemd.spec | 4 ---- tmpfiles-suse.conf | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/systemd.changes b/systemd.changes index f491cadd..f08f4ae0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 27 13:02:40 UTC 2023 - Franck Bui + +- Change the group owner of /run/lock from "lock" to "root" (bsc#1212674) + ------------------------------------------------------------------- Mon Jun 26 14:26:28 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 7aeb2d5f..59bfa038 100644 --- a/systemd.spec +++ b/systemd.spec @@ -137,10 +137,6 @@ Requires: netcfg >= 11.5 Requires: systemd-default-settings-branding Requires: systemd-presets-branding Requires: util-linux >= 2.27.1 -Requires: group(lock) -# The next dependency is also needed with file-triggers enabled due to the way -# the libzypp default transaction backend works. -Requires(pre): group(lock) Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding diff --git a/tmpfiles-suse.conf b/tmpfiles-suse.conf index 90da5b70..a199e980 100644 --- a/tmpfiles-suse.conf +++ b/tmpfiles-suse.conf @@ -7,7 +7,7 @@ L+ /etc/mtab - - - - ../proc/self/mounts # FIXME: Might be moved to lockded. -d /run/lock 0775 root lock - +d /run/lock 0775 root root - -# FIXME: Should these one be moved to shadow ? +# FIXME: Move to shadow ? f /var/log/wtmp 0664 root utmp - From 1807b846d52e1061a35314f467922a3303efab48d5e09763d780123a903f24e6 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 27 Jun 2023 15:07:34 +0000 Subject: [PATCH 3/3] Clarify some entries in the changelog OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1406 --- systemd.changes | 13 ++++++++----- tmpfiles-suse.conf | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/systemd.changes b/systemd.changes index f08f4ae0..fb4b065b 100644 --- a/systemd.changes +++ b/systemd.changes @@ -3,6 +3,10 @@ Tue Jun 27 13:02:40 UTC 2023 - Franck Bui - Change the group owner of /run/lock from "lock" to "root" (bsc#1212674) + This allows to drop the dependency "Requires: group(lock)" that was introduced + previously to make sure that the "lock" group will be kept around. This + dependency introduced a dependency cycle. + ------------------------------------------------------------------- Mon Jun 26 14:26:28 UTC 2023 - Franck Bui @@ -12,12 +16,11 @@ Mon Jun 26 14:26:28 UTC 2023 - Franck Bui ------------------------------------------------------------------- Wed Jun 21 10:30:58 UTC 2023 - Franck Bui -- Make sure to pre-install the groups systemd and udev rely on. This is needed - when the tmpfiles are run at package installation time. Theoretically with - only "Requires(pre): group()", rpm is allowed to drop the group at the end of - the package installations hence let's keep "Requires: group()" dep. +- Make sure to keep the groups systemd and udev rely on installed. Theoretically + with only "Requires(pre): group(x)", rpm is allowed to drop group 'x' at the + end of the package installations. - Note: this is also needed when (post)file-triggers are enabled due to the + Note: this is also needed when (trans)file-triggers are enabled due to the current limitation of the default libzypp transaction backend. ------------------------------------------------------------------- diff --git a/tmpfiles-suse.conf b/tmpfiles-suse.conf index a199e980..74acc896 100644 --- a/tmpfiles-suse.conf +++ b/tmpfiles-suse.conf @@ -6,7 +6,7 @@ # Legacy symlink. Maybe should be owned by util-linux ? L+ /etc/mtab - - - - ../proc/self/mounts -# FIXME: Might be moved to lockded. +# FIXME: move to filesystem ? d /run/lock 0775 root root - # FIXME: Move to shadow ?