From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 7 Jan 2025 19:19:45 +0000 (+0900)
Subject: rpm: mark udevd for reloading when an rules file is installed/updated
X-Git-Tag: v258-rc1~1526
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4fd81d03e25cb306b53a928276f975ad77c4f7ce;p=thirdparty%2Fsystemd.git

rpm: mark udevd for reloading when an rules file is installed/updated

Then, we can avoid using udevadm (especially udev control socket) in
processing rpm.
---

diff --git a/src/rpm/triggers.systemd.in b/src/rpm/triggers.systemd.in
index d480ab84b6b..e257afb33b0 100644
--- a/src/rpm/triggers.systemd.in
+++ b/src/rpm/triggers.systemd.in
@@ -70,9 +70,7 @@ assert(rpm.execute("systemd-tmpfiles", "--create"))
 %transfiletriggerin -P 1000600 udev -p <lua> -- {{UDEV_RULES_DIR}}
 -- This script will automatically update udev with new rules if files
 -- have been installed or updated in {{UDEV_RULES_DIR}}.
-if posix.access("/run/udev/control") then
-    assert(rpm.execute("udevadm", "control", "--reload"))
-end
+assert(rpm.execute("{{SYSTEMD_UPDATE_HELPER_PATH}}", "mark-reload-system-units", "systemd-udevd.service"))
 
 %transfiletriggerin -P 1000500 -p <lua> -- {{SYSCTL_DIR}}
 -- This script will automatically apply sysctl rules if files have been
diff --git a/src/rpm/triggers.systemd.sh.in b/src/rpm/triggers.systemd.sh.in
index 1b94f7d73a0..8c1f4e0b1f8 100644
--- a/src/rpm/triggers.systemd.sh.in
+++ b/src/rpm/triggers.systemd.sh.in
@@ -75,9 +75,7 @@ fi
 %transfiletriggerin -P 1000600 udev -- {{UDEV_RULES_DIR}}
 # This script will automatically update udev with new rules if files
 # have been installed or updated in {{UDEV_RULES_DIR}}.
-if test -e /run/udev/control; then
-  udevadm control --reload || :
-fi
+{{SYSTEMD_UPDATE_HELPER_PATH}} mark-reload-system-units systemd-udevd.service || :
 
 %transfiletriggerin -P 1000500 -- {{SYSCTL_DIR}}
 # This script will automatically apply sysctl rules if files have been