OS
/
automount
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes.

This commit is contained in:
Slawomir Wojciech Wojtczak (vermaden) 2012-08-14 13:48:10 +02:00
parent ad830232ca
commit 851376c2e0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
beadm
View File

@ -102,7 +102,7 @@ __be_new() { # 1=SOURCE 2=TARGET
do do
local OPTS="-o ${PROPERTY}=${VALUE} ${OPTS}" local OPTS="-o ${PROPERTY}=${VALUE} ${OPTS}"
done << EOF done << EOF
$( zfs get -o name,property,value -s local,received -H all ${FS} | grep -v -E "canmount" ) $( zfs get -o name,property,value -s local,received -H all ${FS} | grep -v canmount )
EOF EOF
DATASET=$( echo ${FS} | awk '{print $1}' | sed -E s/"^${POOL}\/ROOT\/${SOURCE##*/}"/"${POOL}\/ROOT\/${2##*/}"/g ) DATASET=$( echo ${FS} | awk '{print $1}' | sed -E s/"^${POOL}\/ROOT\/${SOURCE##*/}"/"${POOL}\/ROOT\/${2##*/}"/g )
if [ "${OPTS}" = "-o = " ] if [ "${OPTS}" = "-o = " ]
@ -497,8 +497,7 @@ EOF
then then
continue continue
else else
MOUNTPOINT=$( echo "${FS}" | sed s/"${PREFIX}"//g ) MOUNTPOINT="/$( echo "${FS}" | sed s/"${PREFIX}"//g )"
MOUNTPOINT="/${MOUNTPOINT}"
fi fi
fi fi
fi fi
@ -519,7 +518,7 @@ EOF
(umount|unmount) # ---------------------------------------------------------- (umount|unmount) # ----------------------------------------------------------
if [ ${#} -eq 2 ] if [ ${#} -eq 2 ]
then then
# we need this section for argument checking # we need this empty section for argument checking
: :
elif [ ${#} -eq 3 -a "${2}" = "-f" ] elif [ ${#} -eq 3 -a "${2}" = "-f" ]
then then