diff options
| author | wchang kim <wchang.kim@samsung.com> | 2016-08-15 21:35:45 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-08-15 21:35:45 -0700 |
| commit | 2e9473b3d964dfd7769c2a6c240d2648c99dacdc (patch) | |
| tree | b8aa5e8edece07998f28734893636cdd8a0728f8 | |
| parent | c87a3b281d50ba1b25a8fbaf1dd4cb7d1c7dcddc (diff) | |
| parent | 5f46e4e2b2d70b0ff2959f6cea9722210875b6d6 (diff) | |
| download | system-plugin-accepted/tizen/common/20160816.130311.tar.gz system-plugin-accepted/tizen/common/20160816.130311.tar.bz2 system-plugin-accepted/tizen/common/20160816.130311.zip | |
Merge "Description : Change the mount method in service file." into tizensubmit/tizen/20160816.052549accepted/tizen/wearable/20160817.040554accepted/tizen/tv/20160817.040538accepted/tizen/mobile/20160817.040520accepted/tizen/ivi/20160817.040611accepted/tizen/common/20160816.130311
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | packaging/system-plugin.spec | 2 | ||||
| -rw-r--r-- | scripts/mount-user.sh | 7 | ||||
| -rw-r--r-- | units/lazy_mount.service | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 2e507e8..31c195a 100644 --- 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 0692726..baa81d1 100644 --- a/packaging/system-plugin.spec +++ b/packaging/system-plugin.spec @@ -251,6 +251,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 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 --- 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 |