units: order service(s) before udevd, not udev-trigger (coldplug)

Since hotplugs happen as soon as udevd is started, there is not much sense
in giving udev-trigger an After= dependency on any service.  The device
could be hotplugged before coldplug starts.

This is intended to avoid the race window where we create the hwdb with
the wrong selinux context (then fix it up afterwards).
https://github.com/systemd/systemd/issues/3458#issuecomment-322444107

diff --git a/units/systemd-udev-trigger.service.in b/units/systemd-udev-trigger.service.in
index 1e04d11fe39bb72a1d571cb36280787c89a300da..0c33909cee3585f4742bccab64133e83ac70cbbb 100644 (file)
--- a/units/systemd-udev-trigger.service.in
+++ b/units/systemd-udev-trigger.service.in
@@ -10,7 +10,7 @@ Description=udev Coldplug all Devices
 Documentation=man:udev(7) man:systemd-udevd.service(8)
 DefaultDependencies=no
 Wants=systemd-udevd.service
-After=systemd-udevd-kernel.socket systemd-udevd-control.socket systemd-hwdb-update.service
+After=systemd-udevd-kernel.socket systemd-udevd-control.socket
 Before=sysinit.target
 ConditionPathIsReadWrite=/sys
 

diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
index 5860545801de24d0aee1221132fa1d78fcb6d917..3b92c6a8662cb760d870bdf58c225b1cae59761a 100644 (file)
--- a/units/systemd-udevd.service.in
+++ b/units/systemd-udevd.service.in
@@ -9,7 +9,7 @@
 Description=udev Kernel Device Manager
 Documentation=man:systemd-udevd.service(8) man:udev(7)
 DefaultDependencies=no
-After=systemd-sysusers.service
+After=systemd-sysusers.service systemd-hwdb-update.service
 Before=sysinit.target
 ConditionPathIsReadWrite=/sys