From owner-svn-src-stable-9@FreeBSD.ORG  Thu May 17 15:22:09 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 26093106566C;
	Thu, 17 May 2012 15:22:09 +0000 (UTC)
	(envelope-from jpaetzel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 109238FC08;
	Thu, 17 May 2012 15:22:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4HFM8Tn004683;
	Thu, 17 May 2012 15:22:08 GMT
	(envelope-from jpaetzel@svn.freebsd.org)
Received: (from jpaetzel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4HFM8xu004681;
	Thu, 17 May 2012 15:22:08 GMT
	(envelope-from jpaetzel@svn.freebsd.org)
Message-Id: <201205171522.q4HFM8xu004681@svn.freebsd.org>
From: Josh Paetzel <jpaetzel@FreeBSD.org>
Date: Thu, 17 May 2012 15:22:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235552 - stable/9/usr.sbin/pc-sysinstall/backend
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 May 2012 15:22:09 -0000

Author: jpaetzel
Date: Thu May 17 15:22:08 2012
New Revision: 235552
URL: http://svn.freebsd.org/changeset/base/235552

Log:
  MFC 235453:
  
  Style fixes.
  
  Submitted by:	kmoore
  Obtained from:	PC-BSD
  Sponsored by:	iXsystems

Modified:
  stable/9/usr.sbin/pc-sysinstall/backend/functions.sh
Directory Properties:
  stable/9/usr.sbin/pc-sysinstall/   (props changed)

Modified: stable/9/usr.sbin/pc-sysinstall/backend/functions.sh
==============================================================================
--- stable/9/usr.sbin/pc-sysinstall/backend/functions.sh	Thu May 17 15:20:21 2012	(r235551)
+++ stable/9/usr.sbin/pc-sysinstall/backend/functions.sh	Thu May 17 15:22:08 2012	(r235552)
@@ -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