Apply some more cleans-up

* Remove all contents in rc.emul
* Remove rc.emul service (emul-legacy-start.service) from systemd
* Introduce emul-common-preinit.service

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

diff --git a/filesystem/etc/rc.d/rc.emul b/filesystem/etc/rc.d/rc.emul
index e8b8b51a017a0c325f023ec0ca51c7d450a5d131..e18e65387bee78448847d9730f14de951f9a7cae 100755 (executable)
--- a/filesystem/etc/rc.d/rc.emul
+++ b/filesystem/etc/rc.d/rc.emul
@@ -8,7 +8,9 @@ C_='\033[0m'            #Color off
 
 echo -e "[${_G}rc.emul : script start ${C_}]"
 
-echo -e "[${_G}Setting power manager state value ${C_}]"
-/usr/bin/vconftool set -t int memory/pm/state 1 -f
+# commented out by caramis...
+# It is not needed since backlight turn off after 10 minutes.
+#echo -e "[${_G}Setting power manager state value ${C_}]"
+#/usr/bin/vconftool set -t int memory/pm/state 1 -f
 
 echo -e "[${_G}rc.emul : script end ${C_}]"

diff --git a/filesystem/usr/lib/systemd/system/emul-common-preinit.service b/filesystem/usr/lib/systemd/system/emul-common-preinit.service
new file mode 100644 (file)
index 0000000..dad5f66
--- /dev/null
+++ b/filesystem/usr/lib/systemd/system/emul-common-preinit.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Legacy emulator startup script
+DefaultDependencies=no
+After=vconf-setup.service
+Before=basic.target
+
+[Service]
+Type=oneshot
+
+# W/A for alarm-service
+ExecStart=/bin/touch /dev/rtc1
+
+[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
deleted file mode 100644 (file)
index 72c259b..0000000
--- a/filesystem/usr/lib/systemd/system/emul-legacy-start.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Legacy emulator startup script
-DefaultDependencies=no
-After=vconf-setup.service
-Before=basic.target
-
-[Service]
-Type=oneshot
-
-# W/A for alarm-service
-ExecStartPre=/bin/touch /dev/rtc1
-
-ExecStart=/etc/rc.d/rc.emul
-
-[Install]
-WantedBy=emulator_preinit.target

diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec
index cc9e6952c81337b387a36fe6c7edab6f5893e5fa..36232cbcd5b019bd692af16802bf701ea8feec2e 100644 (file)
--- a/packaging/system-plugin-emulator.spec
+++ b/packaging/system-plugin-emulator.spec
@@ -1,5 +1,5 @@
 Name: system-plugin-emulator
-Version: 0.0.4
+Version: 0.0.5
 Release: 1
 
 %define systemd_dir     /usr/lib/systemd
@@ -40,19 +40,19 @@ ln -s /etc/init.d/ssh %{buildroot}/etc/rc.d/rc3.d/S50ssh
 # for systemd
 # 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
+ln -s %{systemd_dir}/system/emulator_preinit.target %{buildroot}/%{systemd_dir}/system/basic.target.wants/
 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-setup-audio-volume.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/emul-setup-audio-volume.service
-ln -s %{systemd_dir}/system/emul-mount-hostdir.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/emul-mount-hostdir.service
-ln -s %{systemd_dir}/system/emul-legacy-start.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/emul-legacy-start.service
+ln -s %{systemd_dir}/system/emul-opengl-mode.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/
+ln -s %{systemd_dir}/system/emul-opengl-yagl.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/
+ln -s %{systemd_dir}/system/emul-setup-audio-volume.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/
+ln -s %{systemd_dir}/system/emul-mount-hostdir.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/
+ln -s %{systemd_dir}/system/emul-common-preinit.service %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/
 # 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
+ln -s %{systemd_dir}/system/emulator.target %{buildroot}/%{systemd_dir}/system/multi-user.target.wants/
 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
+ln -s %{systemd_dir}/system/sdbd.service %{buildroot}/%{systemd_dir}/system/emulator.target.wants/
+ln -s %{systemd_dir}/system/sshd.service %{buildroot}/%{systemd_dir}/system/emulator.target.wants/
 
 %post
 #make fstab
@@ -88,12 +88,12 @@ fi
 /usr/lib/systemd/system/multi-user.target.wants/emulator.target
 /usr/lib/systemd/system/emul-setup-audio-volume.service
 /usr/lib/systemd/system/emul-mount-hostdir.service
-/usr/lib/systemd/system/emul-legacy-start.service
+/usr/lib/systemd/system/emul-common-preinit.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-setup-audio-volume.service
 /usr/lib/systemd/system/emulator_preinit.target.wants/emul-mount-hostdir.service
-/usr/lib/systemd/system/emulator_preinit.target.wants/emul-legacy-start.service
+/usr/lib/systemd/system/emulator_preinit.target.wants/emul-common-preinit.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