From: Jinhyung Choi <jinhyung2.choi@samsung.com>
Date: Mon, 4 May 2015 05:56:58 +0000 (+0900)
Subject: mount: removed mount associated files
X-Git-Tag: submit/tizen/20150602.060836~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7af35aef947c5946e804f7958186a85e4cdc161d;p=platform%2Fadaptation%2Femulator%2Fsystem-plugin-emulator.git

mount: removed mount associated files

- mount operation is executed by emulator daemon.
  so, removed associated script, service, etc.

Conflicts:

        packaging/system-plugin-emulator.spec

Change-Id: I611e5ec0af41e83e12c17b95061a1e191be553d1
Signed-off-by: Jinhyung Choi <jinhyung2.choi@samsung.com>
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
---

diff --git a/filesystem/etc/emulator/mount-hostdir.sh b/filesystem/etc/emulator/mount-hostdir.sh
deleted file mode 100755
index 08a9ba1..0000000
--- a/filesystem/etc/emulator/mount-hostdir.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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/mount-hostdir b/filesystem/etc/init.d/mount-hostdir
deleted file mode 100755
index ccdc3e4..0000000
--- a/filesystem/etc/init.d/mount-hostdir
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/etc/emulator/mount-hostdir.sh
diff --git a/filesystem/usr/lib/systemd/system/emul-mount-hostdir.service b/filesystem/usr/lib/systemd/system/emul-mount-hostdir.service
deleted file mode 100644
index 4e79310..0000000
--- a/filesystem/usr/lib/systemd/system/emul-mount-hostdir.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Mount host directory
-DefaultDependencies=no
-
-[Service]
-Type=oneshot
-ExecStart=/etc/emulator/mount-hostdir.sh
-
-[Install]
-WantedBy=emulator_preinit.target
diff --git a/packaging/system-plugin-emulator.spec b/packaging/system-plugin-emulator.spec
index 4384501..1da5aa9 100644
--- a/packaging/system-plugin-emulator.spec
+++ b/packaging/system-plugin-emulator.spec
@@ -29,19 +29,12 @@ System plugin files for emulator
 find . -name .gitignore -exec rm -f {} \;
 cp -arf filesystem/* %{buildroot}
 
-# for legacy init
-if [ ! -d %{buildroot}/etc/rc.d/rc3.d ]; then
-    mkdir -p %{buildroot}/etc/rc.d/rc3.d
-fi
-ln -s /etc/init.d/mount-hostdir %{buildroot}//etc/rc.d/rc3.d/S03mount-hostdir
-
 # 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/
 mkdir -p %{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/
 ln -s %{systemd_dir}/system/dev-vdb.swap %{buildroot}/%{systemd_dir}/system/emulator_preinit.target.wants/
 # for emulator.target
@@ -60,9 +53,6 @@ mkdir -p %{buildroot}/%{systemd_dir}/system/tizen-boot.target.wants
 ln -s ../wm_ready.service %{buildroot}/%{systemd_dir}/system/tizen-boot.target.wants/
 mkdir -p %{buildroot}/%{systemd_dir}/system/tizen-system.target.wants
 
-# for host file sharing
-mkdir -p %{buildroot}/mnt/host
-
 # include license
 mkdir -p %{buildroot}/usr/share/license
 cp LICENSE %{buildroot}/usr/share/license/%{name}
@@ -72,10 +62,8 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 /etc/preconf.d/emulator_ns.preinit
 
 %files
-/etc/emulator/mount-hostdir.sh
 /etc/emulator/prerun
 /etc/emulator/prerun.d/model-config.sh
-/etc/init.d/mount-hostdir
 /etc/inittab
 /etc/preconf.d/emulator_ns.preinit
 /etc/preconf.d/systemd_conf.preinit
@@ -84,7 +72,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/S03mount-hostdir
 /usr/lib/systemd/system/emulator_preinit.target
 /usr/lib/systemd/system/emulator.target
 /usr/lib/systemd/system/basic.target.wants/emulator_preinit.target
@@ -96,11 +83,9 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 /usr/lib/systemd/system/multi-user.target.wants/tizen-system.target
 /usr/lib/systemd/system/multi-user.target.wants/tizen-runtime.target
 /usr/lib/systemd/system/emul-setup-audio-volume.service
-/usr/lib/systemd/system/emul-mount-hostdir.service
 /usr/lib/systemd/system/emul-common-preinit.service
 /usr/lib/systemd/system/dev-vdb.swap
 /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-common-preinit.service
 /usr/lib/systemd/system/emulator_preinit.target.wants/dev-vdb.swap
 /usr/lib/systemd/system/tizen-boot.target
@@ -113,5 +98,4 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}
 /usr/lib/systemd/system/tizen-generate-env.service
 /usr/lib/udev/rules.d/51-tizen-udev-default.rules
 /usr/lib/udev/rules.d/95-tizen-emulator.rules
-%dir /mnt/host
 /usr/share/license/%{name}