Introduce emulator.target and emulator_preinit.target

Change-Id: If11c2b6c6bb91d1b43a89873bbba82b4465092fa
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/filesystem/usr/lib/systemd/system/emul-alsa.service b/filesystem/usr/lib/systemd/system/emul-alsa.service
index ba24cf0e73b872a941c2154628d4e0fa70f907b7..1fef4da2ada8bd507d496aa1f6fac94e264d5239 100644 (file)
--- a/filesystem/usr/lib/systemd/system/emul-alsa.service
+++ b/filesystem/usr/lib/systemd/system/emul-alsa.service
@@ -6,3 +6,6 @@ Before=basic.target
 [Service]
 Type=oneshot
 ExecStart=/etc/rc.d/init.d/simulator-alsa
+
+[Install]
+WantedBy=emulator_preinit.target

diff --git a/filesystem/usr/lib/systemd/system/emul-legacy-start.service b/filesystem/usr/lib/systemd/system/emul-legacy-start.service
index 54378ebac336939846a1beea082c5fe51b3290b1..72c259bae08373cf1f6c29a76c1e45e095b35b23 100644 (file)
--- a/filesystem/usr/lib/systemd/system/emul-legacy-start.service
+++ b/filesystem/usr/lib/systemd/system/emul-legacy-start.service
@@ -11,3 +11,6 @@ Type=oneshot
 ExecStartPre=/bin/touch /dev/rtc1
 
 ExecStart=/etc/rc.d/rc.emul
+
+[Install]
+WantedBy=emulator_preinit.target

diff --git a/filesystem/usr/lib/systemd/system/emul-opengl-mode.service b/filesystem/usr/lib/systemd/system/emul-opengl-mode.service
index f5b19c08ed3bb3defc7048ef5aeac48564b36268..e849ee14cdbba57afc879d103893c93e689ee828 100644 (file)
--- a/filesystem/usr/lib/systemd/system/emul-opengl-mode.service
+++ b/filesystem/usr/lib/systemd/system/emul-opengl-mode.service
@@ -6,3 +6,6 @@ Before=basic.target
 [Service]
 Type=oneshot
 ExecStart=/bin/sh -c '/etc/virtgl.sh'
+
+[Install]
+WantedBy=emulator_preinit.target

diff --git a/filesystem/usr/lib/systemd/system/emul-opengl-yagl.service b/filesystem/usr/lib/systemd/system/emul-opengl-yagl.service
index c583ba95abb5ae6fc4b16241abb377163c306db5..82b2e00aaeed08d246576ed410d14b9d6f40ffb2 100644 (file)
--- a/filesystem/usr/lib/systemd/system/emul-opengl-yagl.service
+++ b/filesystem/usr/lib/systemd/system/emul-opengl-yagl.service
@@ -8,3 +8,6 @@ ConditionKernelCommandLine=yagl=1
 [Service]
 Type=oneshot
 ExecStart=/bin/sh -c 'systemctl set-environment LD_LIBRARY_PATH="/usr/lib/yagl${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"'
+
+[Install]
+WantedBy=emulator_preinit.target

diff --git a/filesystem/usr/lib/systemd/system/emulator.target b/filesystem/usr/lib/systemd/system/emulator.target
new file mode 100644 (file)
index 0000000..37e991f
--- /dev/null
+++ b/filesystem/usr/lib/systemd/system/emulator.target
@@ -0,0 +1,12 @@
+# Target for emulator specified service
+# This target runs after network.service in multi-user.target
+
+[Unit]
+Description=Emulator specified
+Requires=multi-user.target
+After=network.service
+AllowIsolate=no
+
+[Install]
+WantedBy=multi-user.target
+

diff --git a/filesystem/usr/lib/systemd/system/emulator_preinit.target b/filesystem/usr/lib/systemd/system/emulator_preinit.target
new file mode 100644 (file)
index 0000000..1442e19
--- /dev/null
+++ b/filesystem/usr/lib/systemd/system/emulator_preinit.target
@@ -0,0 +1,12 @@
+# Target for emulator specified preinit service
+# This target runs after vconf-setup.service in basic.target
+
+[Unit]
+Description=Emulator specified preinit
+Requires=basic.target
+After=vconf-setup.service
+AllowIsolate=no
+
+[Install]
+WantedBy=basic.target
+

diff --git a/filesystem/usr/lib/systemd/system/sdbd.service b/filesystem/usr/lib/systemd/system/sdbd.service
index 298c67e0e0c2d86f840f648e1ed39ca625db58b0..e740b97c4cdc639c55da40a8c998642573b26502 100644 (file)
--- a/filesystem/usr/lib/systemd/system/sdbd.service
+++ b/filesystem/usr/lib/systemd/system/sdbd.service
@@ -8,3 +8,6 @@ Environment=DISPLAY=:0
 PIDFile=/tmp/.sdbd.pid
 RemainAfterExit=yes
 ExecStart=/usr/sbin/sdbd
+
+[Install]
+WantedBy=emulator.target

diff --git a/filesystem/usr/lib/systemd/system/sshd.service b/filesystem/usr/lib/systemd/system/sshd.service
index 930a2e9427f2c87d1e2f8ca8699feaafee67dc84..150ca10d61de5f950db7b866da1d17586eabc836 100644 (file)
--- a/filesystem/usr/lib/systemd/system/sshd.service
+++ b/filesystem/usr/lib/systemd/system/sshd.service
@@ -9,5 +9,5 @@ KillMode=process
 Restart=always
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=emulator.target
 

diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec
index 39e9abe2d6efc8e9c65a6ada1e835a2459dc6fb8..831f582ca24753c8ac8320e3a70445f7e95a08ce 100644 (file)
--- a/packaging/system-plugin-emulator.spec
+++ b/packaging/system-plugin-emulator.spec
@@ -1,7 +1,10 @@
-Summary: System plugin for emulator
 Name: system-plugin-emulator
-Version: 0.0.1
+Version: 0.0.2
 Release: 1
+
+%define systemd_dir     /usr/lib/systemd
+
+Summary: System plugin for emulator
 License: Apache-2.0
 Group: System/Base
 Requires: udev
@@ -29,14 +32,20 @@ cp -arf filesystem/* %{buildroot}
 ln -s /etc/init.d/ssh %{buildroot}/etc/rc.d/rc3.d/S50ssh
 
 # for systemd
-mkdir -p %{buildroot}/usr/lib/systemd/system/basic.target.wants
-mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants
-ln -s /usr/lib/systemd/system/sdbd.service %{buildroot}/usr/lib/systemd/system/basic.target.wants/sdbd.service
-ln -s /usr/lib/systemd/system/emul-opengl-mode.service %{buildroot}/usr/lib/systemd/system/basic.target.wants/emul-opengl-mode.service
-ln -s /usr/lib/systemd/system/emul-opengl-yagl.service %{buildroot}/usr/lib/systemd/system/basic.target.wants/emul-opengl-yagl.service
-ln -s /usr/lib/systemd/system/emul-alsa.service %{buildroot}/usr/lib/systemd/system/basic.target.wants/emul-alsa.service
-ln -s /usr/lib/systemd/system/emul-legacy-start.service %{buildroot}/usr/lib/systemd/system/basic.target.wants/emul-legacy-start.service
-ln -s /usr/lib/systemd/system/sshd.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/sshd.service
+# for emulator_preinit.target
+mkdir -p %{buildroot}/%{systemd_dir}/system/basic.target.wants
+ln -s %{systemd_dir}/system/emulator_preinit.target %{buildroot}/%{systemd_dir}/system/basic.target.wants/emulator_preinit.target
+mkdir -p %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants
+ln -s %{systemd_dir}/system/emul-opengl-mode.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/emul-opengl-mode.service
+ln -s %{systemd_dir}/system/emul-opengl-yagl.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/emul-opengl-yagl.service
+ln -s %{systemd_dir}/system/emul-alsa.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/emul-alsa.service
+ln -s %{systemd_dir}/system/emul-legacy-start.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/emul-legacy-start.service
+# for emulator.target
+mkdir -p %{buildroot}/%{systemd_dir}/system/multi-user.target.wants
+ln -s %{systemd_dir}/system/emulator.target %{buildroot}/%{systemd_dir}/system/multi-user.target.wants/emulator.target
+mkdir -p %{buildroot}/%{systemd_dir}/system/emulator.target.wants
+ln -s %{systemd_dir}/system/sdbd.service %{buildroot}/%{systemd_dir}/system/emulator.target.wants/sdbd.service
+ln -s %{systemd_dir}/system/sshd.service %{buildroot}/%{systemd_dir}/system/emulator.target.wants/sshd.service
 
 %post
 mkdir -p /opt/usr
@@ -120,16 +129,20 @@ touch /dev/rtc1
 /usr/bin/mount_slp.sh
 /usr/bin/save_blenv
 /usr/bin/wlan.sh
+/usr/lib/systemd/system/emulator_preinit.target
+/usr/lib/systemd/system/emulator.target
+/usr/lib/systemd/system/basic.target.wants/emulator_preinit.target
+/usr/lib/systemd/system/multi-user.target.wants/emulator.target
 /usr/lib/systemd/system/emul-alsa.service
 /usr/lib/systemd/system/emul-legacy-start.service
 /usr/lib/systemd/system/emul-opengl-mode.service
 /usr/lib/systemd/system/emul-opengl-yagl.service
+/usr/lib/systemd/system/emulator_preinit.target.wants/emul-alsa.service
+/usr/lib/systemd/system/emulator_preinit.target.wants/emul-legacy-start.service
+/usr/lib/systemd/system/emulator_preinit.target.wants/emul-opengl-mode.service
+/usr/lib/systemd/system/emulator_preinit.target.wants/emul-opengl-yagl.service
 /usr/lib/systemd/system/sdbd.service
-/usr/lib/systemd/system/basic.target.wants/emul-alsa.service
-/usr/lib/systemd/system/basic.target.wants/emul-legacy-start.service
-/usr/lib/systemd/system/basic.target.wants/emul-opengl-mode.service
-/usr/lib/systemd/system/basic.target.wants/emul-opengl-yagl.service
-/usr/lib/systemd/system/basic.target.wants/sdbd.service
 /usr/lib/systemd/system/sshd.service
-/usr/lib/systemd/system/multi-user.target.wants/sshd.service
+/usr/lib/systemd/system/emulator.target.wants/sdbd.service
+/usr/lib/systemd/system/emulator.target.wants/sshd.service
 /usr/lib/udev/rules.d/95-tizen-emulator.rules