diff options
| -rw-r--r-- | etc/fstab_tm1 | 3 | ||||
| -rw-r--r-- | packaging/system-plugin.spec | 8 | ||||
| -rw-r--r-- | units/umount-opt.service | 1 |
3 files changed, 5 insertions, 7 deletions
diff --git a/etc/fstab_tm1 b/etc/fstab_tm1 deleted file mode 100644 index 04c42bc..0000000 --- a/etc/fstab_tm1 +++ /dev/null @@ -1,3 +0,0 @@ -# <file system> <mount point> <type> <options> <dump> <pass> -/dev/root / ext4 defaults,noatime 0 1 -LABEL=user /opt ext4 defaults,noatime 0 2 diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index 815547c..a52487c 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -94,8 +94,6 @@ mkdir -p %{buildroot}%{_sysconfdir} install -m 644 etc/fstab %{buildroot}%{_sysconfdir} # ugly temporary patch for initrd wearable install -m 644 etc/fstab_initrd %{buildroot}%{_sysconfdir} -# fstab for tm1 -install -m 644 etc/fstab_tm1 %{buildroot}%{_sysconfdir} %post systemctl daemon-reload @@ -143,7 +141,7 @@ mv %{_sysconfdir}/fstab_initrd %{_sysconfdir}/fstab # fstab for tm1 %post spreadtrum rm %{_sysconfdir}/fstab -mv %{_sysconfdir}/fstab_tm1 %{_sysconfdir}/fstab +mv %{_sysconfdir}/fstab_initrd %{_sysconfdir}/fstab %files spreadtrum %manifest %{name}.manifest @@ -151,10 +149,12 @@ mv %{_sysconfdir}/fstab_tm1 %{_sysconfdir}/fstab /csa %{_prefix}/lib/udev/rules.d/51-system-plugin-spreadtrum.rules %{_unitdir}/tizen-system-env.service -%{_sysconfdir}/fstab_tm1 +%{_sysconfdir}/fstab_initrd %{_unitdir}/basic.target.wants/tizen-system-env.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-system\x2ddata.service %{_unitdir}/basic.target.wants/resize2fs@dev-disk-by\x2dlabel-user.service %{_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 diff --git a/units/umount-opt.service b/units/umount-opt.service index 49fa948..9ed8170 100644 --- a/units/umount-opt.service +++ b/units/umount-opt.service @@ -1,6 +1,7 @@ [Unit] Description=Unmount opt DefaultDependencies=no +ConditionPathIsMountPoint=/opt Before=local-fs-pre.target local-fs.target shutdown.target Requires=local-fs-pre.target |