Rework delayed.targetsubmit/tizen/20190729.014500submit/tizen/20190726.064005submit/tizen/20180808.063658accepted/tizen/unified/20190730.112055

start delayed.service --> finish default.target --> start all of delayed.service -->
finish delayed.target --> StartupFinished

Change-Id: I2f291ea8b5f535157eec4f105f2c37b0cea448c9

5 files changed, 39 insertions, 12 deletions

diff --git a/units/user/delayed.service b/units/user/delayed.service
deleted file mode 100644
index 8ed5a997d6..0000000000
--- a/units/user/delayed.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Trigger User Delayed Services
-Requires=default.target
-After=default.target
-DefaultDependencies=no
-RefuseManualStart=yes
-RefuseManualStop=yes
-
-[Service]
-ExecStart=/usr/bin/wait_systemd_startupfinished.sh --user
-RemainAfterExit=yes
diff --git a/units/user/delayed.target b/units/user/delayed.target
index ae064054bc..420deee1e8 100644
--- a/units/user/delayed.target
+++ b/units/user/delayed.target
@@ -1,2 +1,2 @@
 [Unit]
-Description=User Delayed Services
+Description=User Delayed Target
diff --git a/units/user/user-default-target-done.service b/units/user/user-default-target-done.service
new file mode 100644
index 0000000000..e7c3d82a4f
--- /dev/null
+++ b/units/user/user-default-target-done.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=User Default Target Done Service
+After=default.target
+DefaultDependencies=no
+RefuseManualStart=yes
+RefuseManualStop=yes
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/touch /run/user/5001/systemd/default.target.done
+RemainAfterExit=yes
diff --git a/units/user/user-delayed-target-done.service b/units/user/user-delayed-target-done.service
new file mode 100644
index 0000000000..3a9b51eb6d
--- /dev/null
+++ b/units/user/user-delayed-target-done.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=User Delayed Target Done Service
+After=delayed.target
+DefaultDependencies=no
+RefuseManualStart=yes
+RefuseManualStop=yes
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/touch /run/user/5001/systemd/delayed.target.done
+RemainAfterExit=yes
diff --git a/units/user/user-delayed-target-trigger.service b/units/user/user-delayed-target-trigger.service
new file mode 100644
index 0000000000..5619c3d2cf
--- /dev/null
+++ b/units/user/user-delayed-target-trigger.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=User Delayed Target Trigger Service
+After=basic.target
+DefaultDependencies=no
+Wants=wait-mount@opt-usr.service
+After=wait-mount@opt-usr.service
+RefuseManualStart=yes
+RefuseManualStop=yes
+
+[Service]
+# 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
+ExecStart=/usr/bin/wait-default-target.sh User
+ExecStart=/usr/bin/systemctl --no-block --user start delayed.target
+RemainAfterExit=yes