From 169665f652d098680f8f777dfa72a88966a62367 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Mon, 22 Apr 2013 14:44:44 +0900 Subject: [PATCH] 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 --- filesystem/etc/rc.d/rc.emul | 6 ++++-- ...y-start.service => emul-common-preinit.service} | 4 +--- packaging/system-plugin-emulator.spec | 24 +++++++++++----------- 3 files changed, 17 insertions(+), 17 deletions(-) rename filesystem/usr/lib/systemd/system/{emul-legacy-start.service => emul-common-preinit.service} (77%) diff --git a/filesystem/etc/rc.d/rc.emul b/filesystem/etc/rc.d/rc.emul index e8b8b51..e18e653 100755 --- 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-legacy-start.service b/filesystem/usr/lib/systemd/system/emul-common-preinit.service similarity index 77% rename from filesystem/usr/lib/systemd/system/emul-legacy-start.service rename to filesystem/usr/lib/systemd/system/emul-common-preinit.service index 72c259b..dad5f66 100644 --- a/filesystem/usr/lib/systemd/system/emul-legacy-start.service +++ b/filesystem/usr/lib/systemd/system/emul-common-preinit.service @@ -8,9 +8,7 @@ Before=basic.target Type=oneshot # W/A for alarm-service -ExecStartPre=/bin/touch /dev/rtc1 - -ExecStart=/etc/rc.d/rc.emul +ExecStart=/bin/touch /dev/rtc1 [Install] WantedBy=emulator_preinit.target diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec index cc9e695..36232cb 100644 --- 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 -- 2.7.4