From 156730831730701cada2750e826abbf7b113861f Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 2 Dec 2011 10:18:46 +0100 Subject: add a generator to pull rc-local.service in rc-local.service acts as an ordering barrier even if its condition is false, because conditions are evaluated when the service is about to be started. To avoid the ordering barrier in a legacy-free system, add a generator to pull rc-local.service into the transaction only if the script is executable. If/when we rewrite SysV compatibility into a generator, this one can become a part of it. --- units/fedora/rc-local.service | 4 +++- units/suse/rc-local.service | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'units') diff --git a/units/fedora/rc-local.service b/units/fedora/rc-local.service index 106b12c67..fade90c8d 100644 --- a/units/fedora/rc-local.service +++ b/units/fedora/rc-local.service @@ -5,8 +5,10 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. +# This unit gets pulled automatically into multi-user.target by +# systemd-rc-local-generator if /etc/rc.d/rc.local is executable. [Unit] -Description=/etc/rc.local Compatibility +Description=/etc/rc.d/rc.local Compatibility ConditionFileIsExecutable=/etc/rc.d/rc.local [Service] diff --git a/units/suse/rc-local.service b/units/suse/rc-local.service index d4ff92f59..0b9e1d0f9 100644 --- a/units/suse/rc-local.service +++ b/units/suse/rc-local.service @@ -5,6 +5,8 @@ # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. +# This unit gets pulled automatically into multi-user.target by +# systemd-rc-local-generator if /etc/init.d/boot.local is executable. [Unit] Description=/etc/init.d/boot.local Compatibility ConditionFileIsExecutable=/etc/init.d/boot.local -- cgit v1.2.3