systemd: fix failure on emul-setup-audio-volume.service

Conflicts:

        packaging/system-plugin-emulator.spec

Change-Id: Ib2e800739f4312265e66a5ac2f046a47730dd706
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>

diff --git a/filesystem/etc/emulator/setup-audio-volume.sh b/filesystem/etc/emulator/setup-audio-volume.sh
deleted file mode 100755 (executable)
index 199e19b..0000000
--- a/filesystem/etc/emulator/setup-audio-volume.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-amixer cset name='Master Playback Switch' 1
-amixer cset name='Master Playback Volume' 50
-amixer cset name='PCM Playback Switch' 1
-amixer cset name='PCM Playback Volume' 50

diff --git a/filesystem/etc/init.d/setup-audio-volume b/filesystem/etc/init.d/setup-audio-volume
deleted file mode 100755 (executable)
index 09ba1a5..0000000
--- a/filesystem/etc/init.d/setup-audio-volume
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/etc/emulator/setup-audio-volume.sh

diff --git a/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service b/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service
index f930330..351d420 100644 (file)
--- a/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service
+++ b/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service
@@ -4,7 +4,10 @@ DefaultDependencies=no
 
 [Service]
 Type=oneshot
-ExecStart=/etc/emulator/setup-audio-volume.sh
+ExecStart=/opt/usr/devel/usr/bin/amixer "cset" "name='Master Playback Switch'" "1"
+ExecStart=/opt/usr/devel/usr/bin/amixer "cset" "name='Master Playback Volume'" "50"
+ExecStart=/opt/usr/devel/usr/bin/amixer "cset" "name='PCM Playback Switch'" "1"
+ExecStart=/opt/usr/devel/usr/bin/amixer "cset" "name='PCM Playback Volume'" "31"
 
 [Install]
 WantedBy=emulator_preinit.target

diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec
index d2fdbbb..37520fc 100644 (file)
--- a/packaging/system-plugin-emulator.spec
+++ b/packaging/system-plugin-emulator.spec
@@ -33,7 +33,6 @@ cp -arf filesystem/* %{buildroot}
 if [ ! -d %{buildroot}/etc/rc.d/rc3.d ]; then
     mkdir -p %{buildroot}/etc/rc.d/rc3.d
 fi
-ln -s /etc/init.d/setup-audio-volume %{buildroot}//etc/rc.d/rc3.d/S02setup-audio-volume
 ln -s /etc/init.d/mount-hostdir %{buildroot}//etc/rc.d/rc3.d/S03mount-hostdir
 
 # for systemd
@@ -73,11 +72,9 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 /etc/preconf.d/emulator_ns.preinit
 
 %files
-/etc/emulator/setup-audio-volume.sh
 /etc/emulator/mount-hostdir.sh
 /etc/emulator/prerun
 /etc/emulator/prerun.d/model-config.sh
-/etc/init.d/setup-audio-volume
 /etc/init.d/mount-hostdir
 /etc/inittab
 /etc/preconf.d/emulator_ns.preinit
@@ -87,7 +84,6 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 /etc/rc.d/rc.firstboot
 /etc/rc.d/rc.shutdown
 /etc/rc.d/rc.sysinit
-/etc/rc.d/rc3.d/S02setup-audio-volume
 /etc/rc.d/rc3.d/S03mount-hostdir
 /usr/lib/systemd/system/emulator_preinit.target
 /usr/lib/systemd/system/emulator.target