forked from pool/systemd
94f1d69402
See https://github.com/openSUSE/systemd/blob/SUSE/v255/NEWS for details. - This includes the following bug fixes: - commit 6e10405aa25fe5e76b740d9ec59730e3f4470c7a (bsc#1219766) - The following patches have been rebased: - 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch - 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch - 0009-pid1-handle-console-specificities-weirdness-for-s390.patch - 5001-Revert-udev-update-devlink-with-the-newer-device-nod.patch - 5002-Revert-udev-revert-workarounds-for-issues-caused-by-.patch - The following patches have been removed since they're part of v255: - 5003-cgroup-rename-TasksMax-structure-to-CGroupTasksMax.patch - 5004-bus-print-properties-ignore-CGROUP_LIMIT_MAX-for-Mem.patch - 5005-bus-print-properties-prettify-more-unset-properties.patch - systemd-boot has been added to the list of the dependencies of the systemd-testsuite package as the installation of the bootloader is now tested. - the following patches have been backported on top of v255.3: 96edf7ad18 service: Demote log level of NotifyAccess= messages to debug (bsc#1210113 jsc#PED-6214) fdde7f26d6 vconsole-setup: don't fail if the only found vc is already used by plymouth (bsc#1218618) f96c587d41 rules: set up tty permissions and group for /dev/hvc* nodes (bsc#1218137) 63a41b8899 vconsole-setup: remember the correct error value when open_terminal() fails f51a2e038c vconsole-setup: handle the case where the vc is in KD_GRAPHICS mode more gracefully (bsc#1215282) 15025a04c4 test: make sure to install the filesystem package in the test image on SUSE 06fecfb635 test: make sure that sd-boot is installed before testing bootctl 1e8788ea68 test: install systemd-boot in openSUSE test images 6e2875ad43 test/test-shutdown.py: optionally display the test I/Os in a dedicated log file 4be1a801b4 test-69: send SIGTERM to ask systemd-nspawn to properly stop the container 7bdab7b7c7 man: Document ranges for distributions config files and local config files 3f12a6c22f test: systemd-update-utmp is optional OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1497
38 lines
1.9 KiB
Diff
38 lines
1.9 KiB
Diff
From d624ceb7f2e6e286cf876f2ff9bf90532166c7f9 Mon Sep 17 00:00:00 2001
|
|
From: Franck Bui <fbui@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 e12c26ce5a..6ba38087dc 100644
|
|
--- a/src/udev/udev-node.c
|
|
+++ b/src/udev/udev-node.c
|
|
@@ -467,13 +467,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
|
|
|