Franck Bui
0f889b7e09
Some tools in the experimental sub-package cannot be disabled at compile time. Previously, these tools were manually deleted after installation to prevent rpmbuild from reporting unpackaged files. However, as the number of such tools continues to grow, it's simpler to include them in the mini-experimental sub-package. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1650
38 lines
2.0 KiB
Diff
38 lines
2.0 KiB
Diff
From f847d3d3b73c22c674bb713f179522cef8ddabb7 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 673f723ff2..6e2fff72e9 100644
|
|
--- a/src/udev/udev-node.c
|
|
+++ b/src/udev/udev-node.c
|
|
@@ -457,13 +457,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_create_symlink(dev, /* devnode = */ NULL, slink);
|
|
}
|
|
|
|
--
|
|
2.43.0
|
|
|