summaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-12-07 13:58:07 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2008-12-07 13:58:07 +0800
commitc8ed1bc4c19e88905469904a1512d7525c6377b2 (patch)
treec26ef73d12d9ae065e4ac1be50670de28241b02a /sysutils
parenta289ca1bfc859a6ff762677f8defafddc06c5297 (diff)
downloadmarcuscom-ports-c8ed1bc4c19e88905469904a1512d7525c6377b2.tar.gz
marcuscom-ports-c8ed1bc4c19e88905469904a1512d7525c6377b2.tar.zst
marcuscom-ports-c8ed1bc4c19e88905469904a1512d7525c6377b2.zip
Add support for the -u argument.
Submitted by: Kris Moore <kris@pcbsd.com> git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11813 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/hal/Makefile4
-rwxr-xr-xsysutils/hal/files/mount-fuse15
2 files changed, 16 insertions, 3 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile
index 6c1243d92..81c560233 100644
--- a/sysutils/hal/Makefile
+++ b/sysutils/hal/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/sysutils/hal/Makefile,v 1.51 2008/10/26 20:37:46 marcus Exp $
+# $MCom: ports/sysutils/hal/Makefile,v 1.52 2008/10/27 17:26:32 marcus Exp $
#
PORTNAME= hal
DISTVERSION= 0.5.11
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= sysutils
MASTER_SITES= http://hal.freedesktop.org/releases/
diff --git a/sysutils/hal/files/mount-fuse b/sysutils/hal/files/mount-fuse
index d23b47141..ae906a814 100755
--- a/sysutils/hal/files/mount-fuse
+++ b/sysutils/hal/files/mount-fuse
@@ -17,6 +17,7 @@ FUSEDB="${FUSEDB}/.fuse-mnts"
MNTSTRING=""
OPTIONS=""
FOUNDOPT="0"
+FOUNDU="0"
HWDEV=""
FOUNDDEV="0"
@@ -25,6 +26,9 @@ do
if [ "$FOUNDOPT" = "1" ]
then
OPTIONS="${OPTIONS} -o ${i}"
+ elif [ "${FOUNDU}" = "1" ]
+ then
+ OPTIONS="${OPTIONS} -o uid=${i}"
else
if [ "${FOUNDDEV}" = "1" ]
@@ -60,13 +64,22 @@ do
fi
# Add the value to our mount string
- if [ "${i}" != "-o" ]
+ if [ "${i}" != "-o" -a "${i}" != "-u" ]
then
MNTSTRING="${MNTSTRING} ${i}"
fi
fi
+ # Check if we are on a -u flag now
+ if [ "${i}" = "-u" ]
+ then
+ FOUNDU="1"
+ else
+ FOUNDU="0"
+ fi
+
+ # Check if we are on a -o option
if [ "${i}" = "-o" ]
then
FOUNDOPT="1"