diff options
| author | INSUN PYO <insun.pyo@samsung.com> | 2020-11-26 14:21:57 +0900 |
|---|---|---|
| committer | Hyotaek Shim <hyotaek.shim@samsung.com> | 2020-11-27 00:26:51 +0000 |
| commit | 7a5d72d63ca31f0908fafb51beae621809da8761 (patch) | |
| tree | e663c41a37815edb6e78f8aaaa288b6d5c0d86cf | |
| parent | 16e50a3d9be8ddaf7867140fe5c21c6986976f7a (diff) | |
| download | systemd-7a5d72d63ca31f0908fafb51beae621809da8761.tar.gz systemd-7a5d72d63ca31f0908fafb51beae621809da8761.tar.bz2 systemd-7a5d72d63ca31f0908fafb51beae621809da8761.zip | |
Delayed target: add delaying the start of delayed.target #2submit/tizen/20201127.004502
Delay time is also applied to user systemd.
System systemd is already applied.
Change-Id: I8da0c1f224a74d45badd82f2ac1dda13cb8febbb
| -rw-r--r-- | packaging/delayed-target-trigger.sh | 7 | ||||
| -rw-r--r-- | units/system-delayed-target-trigger.service.in | 2 | ||||
| -rw-r--r-- | units/user/user-delayed-target-trigger.service | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/packaging/delayed-target-trigger.sh b/packaging/delayed-target-trigger.sh index cbc129057d..aede9448c5 100644 --- 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 491e347405..a3eb7f5a63 100644 --- 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 5619c3d2cf..7abc7086a3 100644 --- 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 |