Delayed target: add delaying the start of delayed.target #2

Delay time is also applied to user systemd.
System systemd is already applied.

Change-Id: I8da0c1f224a74d45badd82f2ac1dda13cb8febbb

diff --git a/packaging/delayed-target-trigger.sh b/packaging/delayed-target-trigger.sh
index cbc1290..aede944 100644 (file)
--- a/packaging/delayed-target-trigger.sh
+++ b/packaging/delayed-target-trigger.sh
@@ -4,18 +4,17 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 # /etc/systemd/delayed-target.conf does not exist
 if [ -z "$DelayedTargetWait" ]
 then
-    echo "Start delayed.target without any delay."
+    echo "Start $1 delayed.target without any delay."
     exit 0;
 fi
 
-echo "Wait $DelayedTargetWait seconds for delayed.target to start."
+echo "Wait $DelayedTargetWait seconds for $1 delayed.target to start."
 
 index=0
 while [ $index -lt "$DelayedTargetWait" ]
 do
     if [ -f /tmp/.systemd_delayed_target_wait ]
     then
-        rm -f /tmp/.systemd_delayed_target_wait
         break;
     fi
 
@@ -24,6 +23,6 @@ do
     sleep 1
 done
 
-echo "Start delayed.target after $index seconds delay."
+echo "Start $1 delayed.target after $index seconds delay."
 
 exit 0;

diff --git a/units/system-delayed-target-trigger.service.in b/units/system-delayed-target-trigger.service.in
index 491e347..a3eb7f5 100644 (file)
--- a/units/system-delayed-target-trigger.service.in
+++ b/units/system-delayed-target-trigger.service.in
@@ -14,7 +14,7 @@ RefuseManualStop=yes
 Type=oneshot
 EnvironmentFile=-/etc/systemd/delayed-target.conf
 ExecStart=@rootbindir@/wait-default-target.sh System
-ExecStart=@rootbindir@/delayed-target-trigger.sh
+ExecStart=@rootbindir@/delayed-target-trigger.sh System
 ExecStart=@rootbindir@/systemctl --no-block start delayed.target
 RemainAfterExit=yes
 SmackProcessLabel=System

diff --git a/units/user/user-delayed-target-trigger.service b/units/user/user-delayed-target-trigger.service
index 5619c3d..7abc708 100644 (file)
--- a/units/user/user-delayed-target-trigger.service
+++ b/units/user/user-delayed-target-trigger.service
@@ -11,6 +11,8 @@ RefuseManualStop=yes
 # At least one service must remain, and systemd will not enter the Startupfinished state.
 # So this unit, which is oneshot type, becomes that one service.
 Type=oneshot
+EnvironmentFile=-/etc/systemd/delayed-target.conf
 ExecStart=/usr/bin/wait-default-target.sh User
+ExecStart=/usr/bin/delayed-target-trigger.sh User
 ExecStart=/usr/bin/systemctl --no-block --user start delayed.target
 RemainAfterExit=yes