summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorAlan Jenkins <alan.christopher.jenkins@gmail.com>2017-08-15 14:22:44 +0100
committerAlan Jenkins <alan.christopher.jenkins@gmail.com>2017-08-15 14:22:44 +0100
commit1d422b153bf9e9409e95e7596a2ea59cdb9e7b19 (patch)
treea48dac1bad79345ee948f3c9c3149d2682671138 /units
parent3533b49e74a42eea5c9413cf1e6a2f74589731c7 (diff)
downloadsystemd-1d422b153bf9e9409e95e7596a2ea59cdb9e7b19.tar.gz
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
Diffstat (limited to 'units')
-rw-r--r--units/systemd-udev-trigger.service.in2
-rw-r--r--units/systemd-udevd.service.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/units/systemd-udev-trigger.service.in b/units/systemd-udev-trigger.service.in
index 1e04d11fe3..0c33909cee 100644
--- 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 5860545801..3b92c6a866 100644
--- 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