From: Kunhoon Baik <knhoon.baik@samsung.com>
Date: Tue, 25 Oct 2016 15:19:05 +0000 (+0900)
Subject: Eliminate umount-opt.service
X-Git-Tag: submit/tizen/20161026.001251^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F58%2F93758%2F1;p=platform%2Fadaptation%2Fsystem-plugin.git

Eliminate umount-opt.service

umount-opt.service was for 2.4 3 partition compatibilty layer in Tizen 2 Partition system.
However, Tizen decided to re-support 3 partition for full compatibility due to 2.4 -> 3.0 upgrade

For your information, 2.4/3.0 Major Compatibilty is

1) Partition : Keep 3 Partitoin
2) App Directory : /opt/usr/apps
3) Content Directory : /opt/usr/media

Change-Id: Ica295ed0dc47677c36637eec6d335edb60c40d20
---

diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index 3b13381..a543a97 100644
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -154,11 +154,6 @@ mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d/
 install -m 644 rules/51-system-plugin-exynos.rules %{buildroot}%{_prefix}/lib/udev/rules.d/
 install -m 644 rules/51-system-plugin-spreadtrum.rules %{buildroot}%{_prefix}/lib/udev/rules.d/
 
-# umount /opt
-install -m 644 units/umount-opt.service %{buildroot}%{_unitdir}
-mkdir -p %{buildroot}%{_unitdir}/local-fs-pre.target.wants
-ln -s ../umount-opt.service %{buildroot}%{_unitdir}/local-fs-pre.target.wants/umount-opt.service
-
 # fstab
 mkdir -p %{buildroot}%{_sysconfdir}
 install -m 644 etc/fstab %{buildroot}%{_sysconfdir}
@@ -240,8 +235,6 @@ systemctl daemon-reload
 %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-system\x2ddata.service
 %{_unitdir}/csa.mount
 %{_unitdir}/local-fs.target.wants/csa.mount
-%{_unitdir}/umount-opt.service
-%{_unitdir}/local-fs-pre.target.wants/umount-opt.service
 
 # ugly temporary patch for initrd wearable
 %post circle
@@ -268,8 +261,6 @@ mv %{_sysconfdir}/fstab_lazymnt %{_sysconfdir}/fstab
 %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service
 %{_unitdir}/csa.mount
 %{_unitdir}/local-fs.target.wants/csa.mount
-%{_unitdir}/umount-opt.service
-%{_unitdir}/local-fs-pre.target.wants/umount-opt.service
 %{_unitdir}/graphical.target.wants/tizen-fstrim-user.timer
 %{_unitdir}/tizen-fstrim-user.timer
 %{_unitdir}/tizen-fstrim-user.service
diff --git a/units/umount-opt.service b/units/umount-opt.service
deleted file mode 100644
index 9402151..0000000
--- a/units/umount-opt.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Unmount opt
-DefaultDependencies=no
-ConditionPathIsMountPoint=/opt
-Before=local-fs-pre.target local-fs.target shutdown.target
-Requires=local-fs-pre.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-SmackProcessLabel=System
-ExecStart=/bin/umount -l /opt