Change location to mount /opt/usr with opt-user.mount instead of /efc/fstab

In order to remove systemd-remount-fs.service because systemd-remount-fs.service uses /etc/fstab.

Change-Id: I45252be4b44dd3427a424c5661e282ad393b6e41

diff --git a/etc/fstab_3parts b/etc/fstab_3parts
index 266fe0f..2f335c7 100644 (file)
--- a/etc/fstab_3parts
+++ b/etc/fstab_3parts
@@ -1,4 +1,3 @@
 # <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
-LABEL=user      /opt/usr        ext4    defaults,noatime    0      2

diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index ee9c14a..d859e8c 100644 (file)
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -375,8 +375,9 @@ mv %{_sysconfdir}/fstab_2parts %{_sysconfdir}/fstab
 %manifest %{name}.manifest
 %license LICENSE.Apache-2.0
 %{_sysconfdir}/fstab_3parts
+%{_unitdir}/opt-usr.mount
 %{_unitdir}/wait-mount@.service
-%{_unitdir}/local-fs.target.wants/wait-mount@opt-usr.service
+%{_unitdir}/local-fs.target.wants/opt-usr.mount
 %{_userunitdir}/wait-mount@.service
 %{_userunitdir}/basic.target.wants/wait-mount@opt-usr.service