systemd: Replace Requires= with Wants=, run trigger in parallel

[elogind.git] / init / udev-settle.service.in

diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in
index be06a3935279a240d14f30bcad624320b669d3c0..f5f5958934b9dcbe32c11c1cbdfc17e599827194 100644 (file)
--- a/init/udev-settle.service.in
+++ b/init/udev-settle.service.in
@@ -1,19 +1,23 @@
-# 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
+Wants=udev.service
+After=udev-trigger.service
 Before=basic.target
 
 [Service]
 Type=oneshot
+TimeoutSec=180
 RemainAfterExit=yes
 ExecStart=@sbindir@/udevadm settle