Description : Change the mount method in service file.

Adding mount-user.sh.
mount-user.sh gets the PARTLABEL from /dev/disk/by-partlabel for user
and mount it.

Change-Id: Ib08023dc41a2268cef8751281c6e113eaf067204

diff --git a/Makefile.am b/Makefile.am
index 2e507e8..31c195a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -170,6 +170,9 @@ systemunit_DATA += \
 BASIC_TARGET_WANTS += \
        lazy_mount.path
 
+bin_SCRIPTS = \
+       scripts/mount-user.sh
+
 # ------------------------------------------------------------------------------
 substitutions = \
        '|rootlibexecdir=$(rootlibexecdir)|' \

diff --git a/packaging/system-plugin.spec b/packaging/system-plugin.spec
index ea3a330..7dbc153 100644 (file)
--- a/packaging/system-plugin.spec
+++ b/packaging/system-plugin.spec
@@ -250,6 +250,8 @@ mv %{_sysconfdir}/fstab_initrd %{_sysconfdir}/fstab
 %{_unitdir}/basic.target.wants/lazy_mount.path
 %{_unitdir}/lazy_mount.path
 %{_unitdir}/lazy_mount.service
+%{_bindir}/mount-user.sh
+
 
 %files -n liblazymount-devel
 %defattr(-,root,root,-)

diff --git a/scripts/mount-user.sh b/scripts/mount-user.sh
new file mode 100644 (file)
index 0000000..34ca172
--- /dev/null
+++ b/scripts/mount-user.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+USER_DISK=`ls /dev/disk/by-partlabel/ | grep -i user`
+USER_MNT=/opt/usr
+
+/usr/bin/mount PARTLABEL=$USER_DISK $USER_MNT

diff --git a/units/lazy_mount.service b/units/lazy_mount.service
index 91b3308..6102f05 100644 (file)
--- a/units/lazy_mount.service
+++ b/units/lazy_mount.service
@@ -6,6 +6,6 @@ ConditionPathIsMountPoint = !/opt/usr
 Type=oneshot
 SmackProcessLabel=System
 ExecStartPre=/usr/bin/rm -f /run/.unlock_mnt /tmp/.lazy_mount
-ExecStart=/usr/bin/mount -L user /opt/usr
+ExecStart=/usr/bin/mount-user.sh
 ExecStartPost=/usr/bin/touch /run/.unlock_mnt
 SuccessExitStatus=0