summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2011-03-31 13:15:47 +0200
committerKay Sievers <kay.sievers@vrfy.org>2011-03-31 13:16:42 +0200
commitdaf32d32172e19e78754999b41c27b45e3629326 (patch)
treee8854a56479290c036a9ee89809f9244dc2e4c1d
parent42b9482ab2da64b4c2f254c227c0efaf83988a84 (diff)
systemd: let settle depend on trigger, do not block basic with trigger
-rw-r--r--init/udev-settle.service.in15
-rw-r--r--init/udev-trigger.service.in1
2 files changed, 9 insertions, 7 deletions
diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in
index be06a39352..bda8626b2d 100644
--- a/init/udev-settle.service.in
+++ b/init/udev-settle.service.in
@@ -1,15 +1,18 @@
-# This barrier service is usually not enabled by default. If enabled,
-# it acts as a barrier for basic.target -- so all later services will
+# This service is usually not enabled by default. If enabled, it
+# acts as a barrier for basic.target -- so all later services will
# wait for udev completely finishing its coldplug run.
#
-# It might be enabled just unconditionally, or pulled-in on-demand by
-# broken or non-hotplug-aware services that assume a fully populated
-# /dev at startup.
+# If needed, to work around broken or non-hotplug-aware services,
+# it might be enabled unconditionally, or pulled-in on-demand by
+# the services that assume a fully populated /dev at startup. It
+# should not be used or pulled-in ever on systems without such
+# legacy services running.
[Unit]
Description=udev Wait for Complete Device Initialization
DefaultDependencies=no
-After=udev.service
+Requires=udev.service
+After=udev-trigger.service
Before=basic.target
[Service]
diff --git a/init/udev-trigger.service.in b/init/udev-trigger.service.in
index 0ede3171ea..745974a7ab 100644
--- a/init/udev-trigger.service.in
+++ b/init/udev-trigger.service.in
@@ -2,7 +2,6 @@
Description=udev Coldplug all Devices
Requires=udev.service
After=udev.service
-Before=basic.target
DefaultDependencies=no
[Service]