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 be06a3935279a240d14f30bcad624320b669d3c0..bda8626b2d7e37c714a570b2f989818ac709742c 100644 (file)
--- 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 0ede3171ea308c9d5b9d74bc2524b4529787b0c3..745974a7ab4e1e56d488d5a4fd52883730a3f2de 100644 (file)
--- 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]