diff options
| author | jpaetzel <jpaetzel@FreeBSD.org> | 2012-05-14 18:06:51 +0000 |
|---|---|---|
| committer | jpaetzel <jpaetzel@FreeBSD.org> | 2012-05-14 18:06:51 +0000 |
| commit | e0670ac2fd648e0f02e63de791a7b6ac7675a4a4 (patch) | |
| tree | 83416dfcdded58f1423fbf37761e467e2b32534d /usr.sbin/pc-sysinstall | |
| parent | e17f34a5a3273ef94143954b441550b53648f636 (diff) | |
| download | FreeBSD-src-e0670ac2fd648e0f02e63de791a7b6ac7675a4a4.zip FreeBSD-src-e0670ac2fd648e0f02e63de791a7b6ac7675a4a4.tar.gz | |
Style fixes.
Submitted by: kmoore
Obtained from: PC-BSD
MFC after: 3 days
Sponsored by: iXsystems
Diffstat (limited to 'usr.sbin/pc-sysinstall')
| -rwxr-xr-x | usr.sbin/pc-sysinstall/backend/functions.sh | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/usr.sbin/pc-sysinstall/backend/functions.sh b/usr.sbin/pc-sysinstall/backend/functions.sh index a5a0794..199faf2 100755 --- a/usr.sbin/pc-sysinstall/backend/functions.sh +++ b/usr.sbin/pc-sysinstall/backend/functions.sh @@ -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 |
