Merge branch 'tizen' into tizen_3.0submit/tizen_3.0_common/20161110.084657submit/tizen_3.0/20161102.073456accepted/tizen/3.0/wearable/20161103.001930accepted/tizen/3.0/tv/20161103.001916accepted/tizen/3.0/mobile/20161103.001901accepted/tizen/3.0/ivi/20161103.001949accepted/tizen/3.0/common/20161114.081321

Change-Id: I3e3a8c386e793ba2fde515cea9f80846c6e1c3e8
Signed-off-by: taeyoung <ty317.kim@samsung.com>

2 files changed, 3 insertions, 22 deletions

diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index 3b13381..885fbea 100644
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -146,6 +146,7 @@ ln -s ../resize2fs@.service %{buildroot}%{_unitdir}/basic.target.wants/resize2fs
 
 ln -s ../resize2fs@.service %{buildroot}%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\\x2dpartlabel-user.service
 ln -s ../resize2fs@.service %{buildroot}%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\\x2dpartlabel-system\\x2ddata.service
+ln -s ../resize2fs@.service %{buildroot}%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\\x2dpartlabel-rootfs.service
 
 ln -s ../tizen-system-env.service %{buildroot}%{_unitdir}/basic.target.wants/tizen-system-env.service
 %install_service multi-user.target.wants ivi-network.service
@@ -154,11 +155,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}
@@ -238,10 +234,9 @@ systemctl daemon-reload
 %{_sysconfdir}/fstab_initrd
 %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-user.service
 %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-system\x2ddata.service
+%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-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
 
 # ugly temporary patch for initrd wearable
 %post circle
@@ -265,11 +260,9 @@ mv %{_sysconfdir}/fstab_lazymnt %{_sysconfdir}/fstab
 %{_unitdir}/basic.target.wants/tizen-system-env.service
 %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-user.service
 %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-system\x2ddata.service
-%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-rootfs.service
+%{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dpartlabel-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