From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 31 Mar 2011 11:15:47 +0000 (+0200)
Subject: systemd: let settle depend on trigger, do not block basic with trigger
X-Git-Tag: 174~206
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=daf32d32172e19e78754999b41c27b45e3629326;p=systemd

systemd: let settle depend on trigger, do not block basic with trigger
---

diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in
index be06a393..bda8626b 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 0ede3171..745974a7 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]