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-27 21:51:12 +02:00
parent 329bbf504d
commit 5ad74d72ad
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
beadm
View File

@ -114,9 +114,9 @@ __be_new() { # 1=SOURCE 2=TARGET
fi fi
# snapshot format # snapshot format
FMT=$( date "+%Y-%m-%d-%H:%M:%S" ) FMT=$( date "+%Y-%m-%d-%H:%M:%S" )
if ! zfs snapshot -r ${1}@${FMT} 1> /dev/null 2> /dev/null # 2##*/ > FMT if ! zfs snapshot -r ${1}@${FMT} 1> /dev/null 2> /dev/null
then then
echo "ERROR: Cannot create snapshot '${1}@${FMT}'" # 2##*/ > FMT echo "ERROR: Cannot create snapshot '${1}@${FMT}'"
exit 1 exit 1
fi fi
fi fi
@ -140,7 +140,7 @@ EOF
then then
zfs clone -o canmount=off ${OPTS} ${FS}@${1##*@} ${DATASET} zfs clone -o canmount=off ${OPTS} ${FS}@${1##*@} ${DATASET}
else else
zfs clone -o canmount=off ${OPTS} ${FS}@${FMT} ${DATASET} # 2##*/ > FMT zfs clone -o canmount=off ${OPTS} ${FS}@${FMT} ${DATASET}
fi fi
done done
} }
@ -310,7 +310,7 @@ case ${1} in
if [ "${ROOTFS}" != "${POOL}/ROOT/${2}" ] if [ "${ROOTFS}" != "${POOL}/ROOT/${2}" ]
then then
TMPMNT=$( mktemp -d /tmp/tmp.XXXXXX ) TMPMNT=$( mktemp -d /tmp/tmp.XXXXXX )
if ! mkdir -p ${TMPMNT} if ! mkdir -p ${TMPMNT} 2> /dev/null
then then
echo "ERROR: Cannot create '${TMPMNT}' directory" echo "ERROR: Cannot create '${TMPMNT}' directory"
exit 1 exit 1
@ -376,12 +376,11 @@ EOF
(destroy) # ----------------------------------------------------------------- (destroy) # -----------------------------------------------------------------
if [ "${2}" != "-F" ] if [ "${2}" != "-F" ]
then then
__be_exist ${POOL}/ROOT/${2}
DESTROY=${2} DESTROY=${2}
else else
__be_exist ${POOL}/ROOT/${3}
DESTROY=${3} DESTROY=${3}
fi fi
__be_exist ${POOL}/ROOT/${DESTROY}
case ${#} in case ${#} in
(2) (2)
echo "Are you sure you want to destroy '${2}'?" echo "Are you sure you want to destroy '${2}'?"