Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2024-01-14 19:01:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new.21961 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd" Sun Jan 14 19:01:13 2024 rev:411 rq:1138298 version:254.8 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2023-12-21 23:37:26.959990591 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new.21961/systemd.changes 2024-01-14 19:01:19.754687267 +0100 @@ -1,0 +2,28 @@ +Fri Jan 12 10:12:15 UTC 2024 - Franck Bui <f...@suse.com> + +- Add 5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch + 5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch + + It seems that systemd upstream has a dubious way to fix broken code these + days... let's revert these hacks until a final decision is taken to solve + https://github.com/systemd/systemd/issues/28141. See also + https://github.com/systemd/systemd/pull/30075. + +------------------------------------------------------------------- +Fri Jan 12 09:34:14 UTC 2024 - Franck Bui <f...@suse.com> + +- Import commit 67a5ac1043417d900bf417a884372ae14a96ef69 (merge of v254.8) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/071ac409a0564863657d8f8a5a35e6a4f914695f...67a5ac1043417d900bf417a884372ae14a96ef69 + +------------------------------------------------------------------- +Thu Dec 21 10:11:53 UTC 2023 - Dominique Leuenberger <dims...@opensuse.org> + +- udev(-mini)?: ensure %_modulesloaddir exists and is owned + properly. Allows other packages to install modules without worry + of the parent directory. We do not ensure /etc/modules-load.d + exists in the -mini flavor, as that directory is not meant to be + used by packages. + +------------------------------------------------------------------- @@ -13 +41 @@ - 071ac409a0 rules: set up tty permissions and group for /dev/hvc* nodes + 071ac409a0 rules: set up tty permissions and group for /dev/hvc* nodes (bsc#1218137) Old: ---- systemd-v254.5+suse.21.g071ac409a0.tar.xz New: ---- 5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch 5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch systemd-v254.8+suse.22.g67a5ac1043.tar.xz BETA DEBUG BEGIN: New: - Add 5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch 5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch New:- Add 5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch 5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.cLRs6f/_old 2024-01-14 19:01:20.830726545 +0100 +++ /var/tmp/diff_new_pack.cLRs6f/_new 2024-01-14 19:01:20.834726691 +0100 @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define archive_version +suse.21.g071ac409a0 +%define archive_version +suse.22.g67a5ac1043 %define _testsuitedir %{_systemd_util_dir}/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -79,7 +79,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 254.5 +Version: 254.8 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -219,6 +219,8 @@ # very few cases, some stuff might be broken in upstream and need to be fixed or # worked around quickly. In these cases, the patches are added temporarily and # will be removed as soon as a proper fix will be merged by upstream. +Patch5001: 5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch +Patch5002: 5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -761,6 +763,7 @@ -Dhtml=%{when_not bootstrap} \ -Dima=%{when_not bootstrap} \ -Dkernel-install=%{when_not bootstrap} \ + -Dkmod=%{when_not bootstrap} \ -Dlibcryptsetup-plugins=%{when_not bootstrap} \ -Dman=%{when_not bootstrap} \ -Dnss-myhostname=%{when_not bootstrap} \ @@ -861,6 +864,10 @@ mv %{buildroot}/usr/lib/modprobe.d/* %{buildroot}%{_modprobedir}/ %endif +# Make sure /usr/lib/modules-load.d exists in udev(-mini)?, so other +# packages can install modules without worry +mkdir -p %{buildroot}%{_modulesloaddir} + # Make sure we don't ship static enablement symlinks in /etc during # installation, presets should be honoured instead. rm -rf %{buildroot}%{_sysconfdir}/systemd/system/*.target.{requires,wants} ++++++ 5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch ++++++ >From 323274d5e7545013b09c280254879dcbf1430fbf Mon Sep 17 00:00:00 2001 From: Franck Bui <f...@suse.com> Date: Fri, 12 Jan 2024 10:54:57 +0100 Subject: [PATCH 5001/5002] Revert "udev: update devlink with the newer device node even when priority is equivalent" This reverts commit 277cb24ffb7a520f640eb36d11340f11bf0c7c4f. --- src/udev/udev-node.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c index 74a70185bc..75845413cf 100644 --- a/src/udev/udev-node.c +++ b/src/udev/udev-node.c @@ -468,13 +468,13 @@ static int link_update(sd_device *dev, const char *slink, bool add) { /* The devlink priority is downgraded. Another device may have a higher * priority now. Let's find the device node with the highest priority. */ } else { - if (current_prio > prio) - /* The devlink with a higher priority already exists and is owned by - * another device. Hence, it is not necessary to recreate it. */ + if (current_prio >= prio) + /* The devlink with equal or higher priority already exists and is + * owned by another device. Hence, it is not necessary to recreate it. */ return 0; - /* This device has the equal or a higher priority than the current. Let's - * create the devlink to our device node. */ + /* This device has a higher priority than the current. Let's create the + * devlink to our device node. */ return node_symlink(dev, NULL, slink); } -- 2.35.3 ++++++ 5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch ++++++ >From 65b0ae29194a335dc2cc1410d57acf7307251791 Mon Sep 17 00:00:00 2001 From: Franck Bui <f...@suse.com> Date: Fri, 12 Jan 2024 10:55:17 +0100 Subject: [PATCH 5002/5002] Revert "udev: revert workarounds for issues caused by the devlink creation optimization" This reverts commit b8fa62589271a0a7552c6eb02e6beac3ca759ba7. --- rules.d/60-persistent-storage.rules.in | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/rules.d/60-persistent-storage.rules.in b/rules.d/60-persistent-storage.rules.in index 835263f3cb..d5e0f5f705 100644 --- a/rules.d/60-persistent-storage.rules.in +++ b/rules.d/60-persistent-storage.rules.in @@ -134,6 +134,17 @@ KERNEL!="sr*|mmcblk[0-9]boot[0-9]", IMPORT{builtin}="blkid" LABEL="persistent_storage_blkid_probe_end" {% endif %} +# Decrease devlink priority for whole disk of ISO hybrid images, and make the +# priority for partitions in the image relatively higher. This is for the case +# that a disk and one of its partition have the same label or so. +# See issue #28468. +ENV{ID_FS_TYPE}=="iso9660", ENV{DEVTYPE}=="disk", OPTIONS+="link_priority=-10" + +# Decrease devlink priority for encrypted partitions, and make the priority for +# decrypted DM devices relatively higher. This is for the case that an encrypted +# partition and its decrypted DM device have the same label. +ENV{ID_FS_USAGE}=="crypto", OPTIONS+="link_priority=-10" + # by-label/by-uuid links (filesystem metadata) ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}" -- 2.35.3 ++++++ files.udev ++++++ --- /var/tmp/diff_new_pack.cLRs6f/_old 2024-01-14 19:01:21.118737058 +0100 +++ /var/tmp/diff_new_pack.cLRs6f/_new 2024-01-14 19:01:21.122737204 +0100 @@ -4,7 +4,9 @@ %config(noreplace) %{_sysconfdir}/udev/udev.conf %if %{without bootstrap} %dir %{_libdir}/cryptsetup +%endif %dir %{_modulesloaddir} +%if %{without bootstrap} %dir %{_prefix}/lib/kernel %dir %{_prefix}/lib/kernel/install.d %endif ++++++ systemd-v254.5+suse.21.g071ac409a0.tar.xz -> systemd-v254.8+suse.22.g67a5ac1043.tar.xz ++++++ /work/SRC/openSUSE:Factory/systemd/systemd-v254.5+suse.21.g071ac409a0.tar.xz /work/SRC/openSUSE:Factory/.systemd.new.21961/systemd-v254.8+suse.22.g67a5ac1043.tar.xz differ: char 26, line 1
