mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-17 15:27:36 +00:00
Code Issues Releases Activity

Style fixes.

Browse Source 
Submitted by:	kmoore
Obtained from:	PC-BSD
MFC after:	3 days
Sponsored by:	iXsystems
This commit is contained in:
Josh Paetzel 2012-05-14 18:06:51 +00:00
parent 6c4d7c3945
commit ef3a36f9c3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=235453
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/pc-sysinstall/backend/functions.sh
View File

@ -208,15 +208,11 @@ fetch_file()
FETCHOUTFILE="$2"
EXITFAILED="$3"
SIZEFILE="${TMPDIR}/.fetchSize"
EXITFILE="${TMPDIR}/.fetchExit"
rm ${SIZEFILE} 2>/dev/null >/dev/null
rm ${FETCHOUTFILE} 2>/dev/null >/dev/null
fetch -s "${FETCHFILE}" >${SIZEFILE}
SIZE="`cat ${SIZEFILE}`"
SIZE=$((SIZE/1024))
SIZE=$(( `fetch -s "${FETCHFILE}"` / 1024 ))
echo "FETCH: ${FETCHFILE}"
echo "FETCH: ${FETCHOUTFILE}" >>${LOGOUT}
@ -278,12 +274,10 @@ get_zpool_name()
NUM=`ls ${TMPDIR}/.zpools/ | wc -l | sed 's| ||g'`
# Is it used in another zpool?
while
z=1
while :
do
NEWNAME="${BASENAME}${NUM}"
zpool import | grep -q "${NEWNAME}"
if [ $? -ne 0 ] ; then break ; fi
zpool import | grep -qw "${NEWNAME}" && break
NUM=$((NUM+1))
done