diff options
| -rw-r--r-- | etc/fstab_initrd_lazymnt | 6 | ||||
| -rw-r--r-- | etc/fstab_lazymnt | 3 | ||||
| -rw-r--r-- | packaging/system-plugin.spec | 14 |
3 files changed, 4 insertions, 19 deletions
diff --git a/etc/fstab_initrd_lazymnt b/etc/fstab_initrd_lazymnt deleted file mode 100644 index 4c80e4d..0000000 --- a/etc/fstab_initrd_lazymnt +++ /dev/null @@ -1,6 +0,0 @@ -# In case of using MCD initrd, / and /opt is already mounted by initrd -# Thus, this patch is temporary files for wearable. -# Basically, initrd should consider this issue. -# <file system> <mount point> <type> <options> <dump> <pass> -/dev/root / ext4 defaults,noatime 0 1 -PARTLABEL=system-data /opt ext4 defaults,noatime 0 2 diff --git a/etc/fstab_lazymnt b/etc/fstab_lazymnt deleted file mode 100644 index 02154dc..0000000 --- a/etc/fstab_lazymnt +++ /dev/null @@ -1,3 +0,0 @@ -# <file system> <mount point> <type> <options> <dump> <pass> -/dev/root / ext4 defaults,noatime 0 1 -LABEL=system-data /opt ext4 defaults,noatime 0 2 diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec index fe6ad1f..16998b3 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -152,9 +152,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} -# lazymnt -install -m 644 etc/fstab_lazymnt %{buildroot}%{_sysconfdir} -install -m 644 etc/fstab_initrd_lazymnt %{buildroot}%{_sysconfdir} # fstrim mkdir -p %{buildroot}%{_unitdir}/graphical.target.wants @@ -182,7 +179,7 @@ systemctl daemon-reload %post -n liblazymount /sbin/ldconfig -/usr/bin/vconftool set -f -t int db/system/lazy_mount_show_ui 1 +/usr/bin/vconftool set -f -t int db/system/lazy_mount_show_ui 0 systemctl daemon-reload %postun -n liblazymount -p /sbin/ldconfig @@ -206,7 +203,7 @@ systemctl daemon-reload %{_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 -%{_sysconfdir}/fstab_lazymnt +%{_sysconfdir}/fstab %{_unitdir}/graphical.target.wants/tizen-fstrim-user.timer %{_unitdir}/tizen-fstrim-user.timer %{_unitdir}/tizen-fstrim-user.service @@ -235,10 +232,7 @@ mv %{_sysconfdir}/fstab_initrd %{_sysconfdir}/fstab # fstab for tm1 %post spreadtrum rm %{_sysconfdir}/fstab -mv %{_sysconfdir}/fstab_initrd_lazymnt %{_sysconfdir}/fstab -%post n4 -rm %{_sysconfdir}/fstab -mv %{_sysconfdir}/fstab_lazymnt %{_sysconfdir}/fstab +mv %{_sysconfdir}/fstab_initrd %{_sysconfdir}/fstab %files spreadtrum %manifest %{name}.manifest @@ -246,7 +240,7 @@ mv %{_sysconfdir}/fstab_lazymnt %{_sysconfdir}/fstab /csa %{_prefix}/lib/udev/rules.d/51-system-plugin-spreadtrum.rules %{_unitdir}/tizen-system-env.service -%{_sysconfdir}/fstab_initrd_lazymnt +%{_sysconfdir}/fstab_initrd %{_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 |