summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/fstab_2parts (renamed from etc/fstab_2part)0
-rw-r--r--etc/fstab_3parts (renamed from etc/fstab)0
-rw-r--r--etc/fstab_initrd7
-rw-r--r--etc/fstab_initrd_lazymnt6
-rw-r--r--etc/fstab_lazymnt3
-rw-r--r--packaging/system-plugin.spec42
6 files changed, 18 insertions, 40 deletions
diff --git a/etc/fstab_2part b/etc/fstab_2parts
index 2f335c7..2f335c7 100644
--- a/etc/fstab_2part
+++ b/etc/fstab_2parts
diff --git a/etc/fstab b/etc/fstab_3parts
index 266fe0f..266fe0f 100644
--- a/etc/fstab
+++ b/etc/fstab_3parts
diff --git a/etc/fstab_initrd b/etc/fstab_initrd
deleted file mode 100644
index 5d9d47b..0000000
--- a/etc/fstab_initrd
+++ /dev/null
@@ -1,7 +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,ro 0 1
-PARTLABEL=system-data /opt ext4 defaults,noatime 0 2
-PARTLABEL=user /opt/usr ext4 defaults,noatime 0 2
diff --git a/etc/fstab_initrd_lazymnt b/etc/fstab_initrd_lazymnt
deleted file mode 100644
index ef71810..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,ro 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 2f335c7..0000000
--- a/etc/fstab_lazymnt
+++ /dev/null
@@ -1,3 +0,0 @@
-# <file system> <mount point> <type> <options> <dump> <pass>
-/dev/root / ext4 defaults,noatime,ro 0 1
-LABEL=system-data /opt ext4 defaults,noatime 0 2
diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index cc9e3b6..2ed93a8 100644
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -243,13 +243,9 @@ install -m 644 rules/60-evdev.hwdb %{buildroot}%{_prefix}/lib/udev/hwdb.d/
# fstab
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}
+install -m 644 etc/fstab_3parts %{buildroot}%{_sysconfdir}
# lazymnt
-install -m 644 etc/fstab_lazymnt %{buildroot}%{_sysconfdir}
-install -m 644 etc/fstab_initrd_lazymnt %{buildroot}%{_sysconfdir}
-install -m 644 etc/fstab_2part %{buildroot}%{_sysconfdir}
+install -m 644 etc/fstab_2parts %{buildroot}%{_sysconfdir}
%if %{temp_wait_mount}
mkdir -p %{buildroot}%{_unitdir_user}/basic.target.wants
install -m 644 units/wait-user-mount.service %{buildroot}%{_unitdir_user}
@@ -305,11 +301,12 @@ 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
+%{_sysconfdir}/fstab_3parts
%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb
%post u3
%{_prefix}/bin/udevadm hwdb --update
+mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab
%files rpi3
%manifest %{name}.manifest
@@ -317,11 +314,12 @@ 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
+%{_sysconfdir}/fstab_3parts
%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb
%post rpi3
%{_prefix}/bin/udevadm hwdb --update
+mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab
%files iot
%manifest %{name}.manifest
@@ -329,13 +327,12 @@ 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_2part
+%{_sysconfdir}/fstab_2parts
%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb
%post iot
%{_prefix}/bin/udevadm hwdb --update
-rm %{_sysconfdir}/fstab
-mv %{_sysconfdir}/fstab_2part %{_sysconfdir}/fstab
+mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab
%posttrans iot
# platform/upstream/dbus
@@ -353,7 +350,7 @@ rm -f %{_sbindir}/e4crypt
%{_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_2parts
%{_unitdir}/graphical.target.wants/tizen-fstrim-user.timer
%{_unitdir}/tizen-fstrim-user.timer
%{_unitdir}/tizen-fstrim-user.service
@@ -369,7 +366,7 @@ rm -f %{_sbindir}/e4crypt
%license LICENSE.Apache-2.0
/initrd
/csa
-%{_sysconfdir}/fstab_initrd
+%{_sysconfdir}/fstab_3parts
%{_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
@@ -378,15 +375,12 @@ rm -f %{_sbindir}/e4crypt
# ugly temporary patch for initrd wearable
%post circle
-rm %{_sysconfdir}/fstab
-mv %{_sysconfdir}/fstab_initrd %{_sysconfdir}/fstab
+mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab
# fstab for tm1
%post spreadtrum
-rm %{_sysconfdir}/fstab
-mv %{_sysconfdir}/fstab_initrd_lazymnt %{_sysconfdir}/fstab
+mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab
%post n4
-rm %{_sysconfdir}/fstab
-mv %{_sysconfdir}/fstab_lazymnt %{_sysconfdir}/fstab
+mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab
%files spreadtrum
%manifest %{name}.manifest
@@ -395,7 +389,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_2parts
%{_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
@@ -473,11 +467,12 @@ ln -s /sbin/init.wrapper /sbin/init
#%{_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
+#%{_sysconfdir}/fstab_3parts
#%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb
%post device-rpi3
#%{_prefix}/bin/udevadm hwdb --update
+#mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab
%files profile-iot
#%manifest %{name}.manifest
@@ -485,13 +480,12 @@ ln -s /sbin/init.wrapper /sbin/init
#%{_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_2part
+#%{_sysconfdir}/fstab_2parts
#%{_prefix}/lib/udev/hwdb.d/60-evdev.hwdb
%post profile-iot
#%{_prefix}/bin/udevadm hwdb --update
-#rm %{_sysconfdir}/fstab
-#mv %{_sysconfdir}/fstab_2part %{_sysconfdir}/fstab
+#mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab
%posttrans profile-iot
## platform/upstream/dbus
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 06:04:49 +0000