From daf32d32172e19e78754999b41c27b45e3629326 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 31 Mar 2011 13:15:47 +0200 Subject: [PATCH] systemd: let settle depend on trigger, do not block basic with trigger --- init/udev-settle.service.in | 15 +++++++++------ init/udev-trigger.service.in | 1 - 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in index be06a3935..bda8626b2 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 0ede3171e..745974a7a 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] -- 2.30.2