Make service for mount hostdir and clean some files up

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

diff --git a/filesystem/etc/emulator/.emptydir b/filesystem/etc/emulator/.emptydir
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/filesystem/etc/emulator/mount-hostdir.sh b/filesystem/etc/emulator/mount-hostdir.sh
new file mode 100755 (executable)
index 0000000..08a9ba1
--- /dev/null
+++ b/filesystem/etc/emulator/mount-hostdir.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Mount host directory on /mnt/host via virtio-9p
+
+if grep "virtio-9p" /proc/cmdline ; then
+    if mount -t 9p -o trans=virtio fileshare /mnt/host -oversion=9p2000.L -o msize=65536; then
+        echo -e "[${_Y}Mount.9pfs succeed${C_}]"
+    else
+        echo -e "[${_R}Mount.9pfs fail!!!!${C_}]"
+    fi
+fi
+

diff --git a/filesystem/etc/init.d/emulator-alsa b/filesystem/etc/emulator/setup-audio-volume.sh
similarity index 100%
rename from filesystem/etc/init.d/emulator-alsa
rename to filesystem/etc/emulator/setup-audio-volume.sh

diff --git a/filesystem/etc/init.d/mount-hostdir b/filesystem/etc/init.d/mount-hostdir
new file mode 100755 (executable)
index 0000000..ccdc3e4
--- /dev/null
+++ b/filesystem/etc/init.d/mount-hostdir
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/emulator/mount-hostdir.sh

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

diff --git a/filesystem/etc/rc.d/rc3.d/S20vmodem b/filesystem/etc/init.d/vmodemd
similarity index 100%
rename from filesystem/etc/rc.d/rc3.d/S20vmodem
rename to filesystem/etc/init.d/vmodemd

diff --git a/filesystem/etc/rc.d/rc.emul b/filesystem/etc/rc.d/rc.emul
index 8cce40a..2ef708f 100755 (executable)
--- a/filesystem/etc/rc.d/rc.emul
+++ b/filesystem/etc/rc.d/rc.emul
@@ -15,37 +15,6 @@ echo -e "[${_G}Initialize battery level ${C_}]"
 #/usr/bin/vconftool set -t int memory/Battery/Level 5 -f
 /usr/bin/vconftool set -t int memory/sysman/battery_status_low 4 -f
 
-#echo -e "[${_G}Mount SD card ${C_}]"
-#mount -o umask=000 /dev/mmcblk0 /mnt/mmc
-#chmod 777 /opt/storage/sdcard
-
-#MMC_MOUNT=`/bin/mount | grep mmc`
-#if [ -n "$MMC_MOUNT" ]; then
-#      echo -e "[${_G}MMC storage detected ${C_}]"
-#      /usr/bin/vconftool set -t memory/sysman/mmc 1 -f
-#      /usr/bin/vconftool set -t int memory/filemanager/Mmc 2 -f
-#fi 
-
-echo -e "[${_G}Mount host directory${C_}]"
-test -d "/mnt/host" || mkdir "/mnt/host"
-if grep "cifs=" /proc/cmdline ; then
-        cifs=`sed 's/^.*cifs=\([^, ]*\).*$/\1/g' /proc/cmdline`
-        opts=`sed 's/^.*cifs=\([^, ]*\),username=\([^, ]*\),password=\([^, ]*\).*$/username=\2,password=\3/g' /proc/cmdline`
-        cifs=`echo $cifs | tr [a-z] [A-Z]`
-        if mount -t cifs //10.0.2.2/$cifs /mnt/host -o $opts,file_mode=0777,dir_mode=0777; then
-               echo -e "[${_Y}Mount.cifs succeed${C_}]"
-       else
-               echo -e "[${_R}Mount.cifs fail!!!!${C_}]"
-       fi
-fi
-if grep "virtio-9p" /proc/cmdline ; then
-       if mount -t 9p -o trans=virtio fileshare /mnt/host -oversion=9p2000.L -o msize=65536; then
-               echo -e "[${_Y}Mount.9pfs succeed${C_}]"
-       else
-               echo -e "[${_R}Mount.9pfs fail!!!!${C_}]"
-       fi
-fi
-
 if grep -q "enable_cam" /proc/cmdline ; then
        if grep -q "enable_cam=1" /proc/cmdline ; then
                echo -e "[${_Y}Webcam is connected. We can use '/dev/video0' for camera.${C_}]"
@@ -55,9 +24,6 @@ if grep -q "enable_cam" /proc/cmdline ; then
        fi
 fi
 
-echo -e "[${_G}to generate modules.dep and map files${C_}]"
-depmod -a
-
 #--move to rc3.d/S30brgihtness
 #echo -e "[${_G}to change brightness's group${C_}]"
 #chgrp system_bklight /sys/class/backlight/emulator/brightness

diff --git a/filesystem/etc/rc.d/rc3.d/S01setup-audio-volume b/filesystem/etc/rc.d/rc3.d/S01setup-audio-volume
new file mode 120000 (symlink)
index 0000000..65ee766
--- /dev/null
+++ b/filesystem/etc/rc.d/rc3.d/S01setup-audio-volume
@@ -0,0 +1 @@
+../../init.d/setup-audio-volume
\ No newline at end of file

diff --git a/filesystem/etc/rc.d/rc3.d/S01simulator-alsa b/filesystem/etc/rc.d/rc3.d/S01simulator-alsa
deleted file mode 120000 (symlink)
index 0d3be9e..0000000
--- a/filesystem/etc/rc.d/rc3.d/S01simulator-alsa
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/simulator-alsa
\ No newline at end of file

diff --git a/filesystem/etc/rc.d/rc3.d/S02mount-hostdir b/filesystem/etc/rc.d/rc3.d/S02mount-hostdir
new file mode 120000 (symlink)
index 0000000..dbe3ef0
--- /dev/null
+++ b/filesystem/etc/rc.d/rc3.d/S02mount-hostdir
@@ -0,0 +1 @@
+../../init.d/mount-hostdir
\ No newline at end of file

diff --git a/filesystem/etc/rc.d/rc3.d/S03vmodemd b/filesystem/etc/rc.d/rc3.d/S03vmodemd
new file mode 120000 (symlink)
index 0000000..e2f76ec
--- /dev/null
+++ b/filesystem/etc/rc.d/rc3.d/S03vmodemd
@@ -0,0 +1 @@
+../../init.d/vmodemd
\ No newline at end of file

diff --git a/filesystem/etc/rc.d/rc5.d/S99zzzbackup_csa b/filesystem/etc/rc.d/rc5.d/S99zzzbackup_csa
deleted file mode 100644 (file)
index f4ed97c..0000000
--- a/filesystem/etc/rc.d/rc5.d/S99zzzbackup_csa
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/csa-tools
\ No newline at end of file

diff --git a/filesystem/usr/lib/systemd/system/emul-alsa.service b/filesystem/usr/lib/systemd/system/emul-mount-hostdir.service
similarity index 55%
rename from filesystem/usr/lib/systemd/system/emul-alsa.service
rename to filesystem/usr/lib/systemd/system/emul-mount-hostdir.service
index 44b906f..4e79310 100644 (file)
--- a/filesystem/usr/lib/systemd/system/emul-alsa.service
+++ b/filesystem/usr/lib/systemd/system/emul-mount-hostdir.service
@@ -1,11 +1,10 @@
 [Unit]
-Description=ALSA setup
+Description=Mount host directory
 DefaultDependencies=no
-Before=basic.target
 
 [Service]
 Type=oneshot
-ExecStart=/etc/init.d/emulator-alsa
+ExecStart=/etc/emulator/mount-hostdir.sh
 
 [Install]
 WantedBy=emulator_preinit.target

diff --git a/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service b/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service
new file mode 100644 (file)
index 0000000..f930330
--- /dev/null
+++ b/filesystem/usr/lib/systemd/system/emul-setup-audio-volume.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Audio volume setup on emulator
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+ExecStart=/etc/emulator/setup-audio-volume.sh
+
+[Install]
+WantedBy=emulator_preinit.target

diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec
index 39f4d27..0642a04 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.2
+Version: 0.0.3
 Release: 1
 
 %define systemd_dir     /usr/lib/systemd
@@ -38,7 +38,8 @@ ln -s %{systemd_dir}/system/emulator_preinit.target %{buildroot}/%{systemd_dir}/
 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-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
 # for emulator.target
 mkdir -p %{buildroot}/%{systemd_dir}/system/multi-user.target.wants
@@ -97,8 +98,12 @@ touch /dev/rtc1
 /bin/mdev
 /bin/route
 /bin/ubimnt.sh
-/etc/emulator/.emptydir
+/etc/emulator/setup-audio-volume.sh
+/etc/emulator/mount-hostdir.sh
 /etc/init.d/csa-tools
+/etc/init.d/setup-audio-volume
+/etc/init.d/mount-hostdir
+/etc/init.d/vmodemd
 /etc/inittab
 /etc/mdev.conf
 /etc/mtools.conf
@@ -106,17 +111,16 @@ touch /dev/rtc1
 /etc/profile.d/proxy_setting.sh
 /etc/profile.d/sensord_setting.sh
 /etc/profile.d/simulator-opengl.sh
-/etc/init.d/emulator-alsa
 /etc/rc.d/rc.emul
 /etc/rc.d/rc.firstboot
 /etc/rc.d/rc.shutdown
 /etc/rc.d/rc.sysinit
-/etc/rc.d/rc3.d/S01simulator-alsa
-/etc/rc.d/rc3.d/S20vmodem
+/etc/rc.d/rc3.d/S01setup-audio-volume
+/etc/rc.d/rc3.d/S02mount-hostdir
+/etc/rc.d/rc3.d/S03vmodemd
 /etc/rc.d/rc3.d/S45vconf-menuscreen
 /etc/rc.d/rc3.d/S50ssh
 /etc/rc.d/rc3.d/S96set_valperiod
-/etc/rc.d/rc5.d/S99zzzbackup_csa
 /etc/virtgl.sh
 /etc/yagl.sh
 /lib/udev/rules.d/99-serial-console.rules
@@ -129,11 +133,13 @@ touch /dev/rtc1
 /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-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-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-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-opengl-mode.service
 /usr/lib/systemd/system/emulator_preinit.target.wants/emul-opengl-yagl.service