From bae652955abf49cedd5bf1105ee4f2df479ca20a Mon Sep 17 00:00:00 2001 From: Hyotaek Shim Date: Thu, 6 Feb 2020 15:39:53 +0900 Subject: Remove /etc/fstab configurations systemd-remount-fs.service is disabled. /opt is mounted at the ramdisk(initrd) stage. Change-Id: I76562e6bb322f28f241f2f3825a9f922978e6f46 Signed-off-by: Hyotaek Shim (cherry picked from commit 0155ad7861a8401946db9048f0fb282c09bf4e15) --- etc/fstab_2parts | 3 --- etc/fstab_3parts | 3 --- packaging/system-plugin.spec | 22 +++------------------- 3 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 etc/fstab_2parts delete mode 100644 etc/fstab_3parts diff --git a/etc/fstab_2parts b/etc/fstab_2parts deleted file mode 100644 index 2f335c7..0000000 --- a/etc/fstab_2parts +++ /dev/null @@ -1,3 +0,0 @@ -# -/dev/root / ext4 defaults,noatime,ro 0 1 -LABEL=system-data /opt ext4 defaults,noatime 0 2 diff --git a/etc/fstab_3parts b/etc/fstab_3parts deleted file mode 100644 index 2f335c7..0000000 --- a/etc/fstab_3parts +++ /dev/null @@ -1,3 +0,0 @@ -# -/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 d859e8c..3cefcfa 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -121,7 +121,7 @@ Requires: %{name} = %{version}-%{release} BuildArch: noarch %description config-2parts -This package provides configuration files for /etc/fstab(remount) +This package provides configuration files for storage partitions %package config-3parts Summary: System configuration files for storage partitions @@ -129,7 +129,7 @@ Requires: %{name} = %{version}-%{release} BuildArch: noarch %description config-3parts -This package provides configuration files for /etc/fstab(remount) +This package provides configuration files for storage partitions %package config-3parts-lzuser Summary: System configuration files for storage partitions @@ -137,7 +137,7 @@ Requires: %{name} = %{version}-%{release} BuildArch: noarch %description config-3parts-lzuser -This package provides configuration files for /etc/fstab(remount) +This package provides configuration files for storage partitions %prep %setup -q @@ -181,10 +181,6 @@ install -m 644 rules/61-system-plugin-n4.rules %{buildroot}%{_prefix}/lib/udev/r mkdir -p %{buildroot}%{_prefix}/lib/udev/hwdb.d/ install -m 644 rules/60-evdev.hwdb %{buildroot}%{_prefix}/lib/udev/hwdb.d/ -# /etc/fstab -install -m 644 etc/fstab_3parts %{buildroot}%{_sysconfdir} -install -m 644 etc/fstab_2parts %{buildroot}%{_sysconfdir} - # fstrim mkdir -p %{buildroot}%{_unitdir}/delayed.target.wants install -m 644 units/tizen-fstrim-user.timer %{buildroot}%{_unitdir} @@ -359,7 +355,6 @@ echo "" %files config-2parts %manifest %{name}.manifest %license LICENSE.Apache-2.0 -%{_sysconfdir}/fstab_2parts %{_sysconfdir}/profile.d/2parts_env.sh %{_unitdir}/wait-mount@.service %{_unitdir}/wait-mount@opt-usr.service.d/no-wait.conf @@ -368,31 +363,20 @@ echo "" %{_userunitdir}/wait-mount@opt-usr.service.d/no-wait.conf %{_userunitdir}/basic.target.wants/wait-mount@opt-usr.service -%post config-2parts -mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab - %files config-3parts %manifest %{name}.manifest %license LICENSE.Apache-2.0 -%{_sysconfdir}/fstab_3parts %{_unitdir}/opt-usr.mount %{_unitdir}/wait-mount@.service %{_unitdir}/local-fs.target.wants/opt-usr.mount %{_userunitdir}/wait-mount@.service %{_userunitdir}/basic.target.wants/wait-mount@opt-usr.service -%post config-3parts -mv %{_sysconfdir}/fstab_3parts %{_sysconfdir}/fstab - %files config-3parts-lzuser %manifest %{name}.manifest %license LICENSE.Apache-2.0 -%{_sysconfdir}/fstab_2parts %{_unitdir}/opt-usr.mount %{_unitdir}/wait-mount@.service %{_unitdir}/local-fs.target.wants/opt-usr.mount %{_userunitdir}/wait-mount@.service %{_userunitdir}/basic.target.wants/wait-mount@opt-usr.service - -%post config-3parts-lzuser -mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab -- cgit v1.2.3