svn commit: r235005 - head/usr.sbin/pc-sysinstall/backend

[Garrett Cooper]

On May 4, 2012, at 8:31 AM, Josh Paetzel <jpaetzel at FreeBSD.org> wrote:

> Author: jpaetzel
> Date: Fri May  4 15:31:35 2012
> New Revision: 235005
> URL: http://svn.freebsd.org/changeset/base/235005
> 
> Log:
>  Use a unique zpool name during install, in the case of having another
>  PC-BSD / FreeBSD zpool on the system for another install.
> 
>  Submitted by:    kmoore
>  Obtained from:    PC-BSD
>  MFC after:    3 days
>  Sponsored by:    iXsystems
> 
> Modified:
>  head/usr.sbin/pc-sysinstall/backend/functions.sh
> 
> Modified: head/usr.sbin/pc-sysinstall/backend/functions.sh
> ==============================================================================
> --- head/usr.sbin/pc-sysinstall/backend/functions.sh    Fri May  4 15:27:18 2012    (r235004)
> +++ head/usr.sbin/pc-sysinstall/backend/functions.sh    Fri May  4 15:31:35 2012    (r235005)
> @@ -216,7 +216,7 @@ fetch_file()
> 
>   fetch -s "${FETCHFILE}" >${SIZEFILE}
>   SIZE="`cat ${SIZEFILE}`"
> -  SIZE="`expr ${SIZE} / 1024`"
> +  SIZE=$((SIZE/1024))

Bug; should be '$SIZE/'

>   echo "FETCH: ${FETCHFILE}"
>   echo "FETCH: ${FETCHOUTFILE}" >>${LOGOUT}
> 
> @@ -276,11 +276,22 @@ get_zpool_name()
>   else
>     # Need to generate a zpool name for this device
>     NUM=`ls ${TMPDIR}/.zpools/ | wc -l | sed 's| ||g'`
> -    NEWNAME="${BASENAME}${NUM}"
> +
> +    # Is it used in another zpool?
> +    while
> +    z=1
> +    do

while :
do

Is better.

> +      NEWNAME="${BASENAME}${NUM}"
> +      zpool import | grep -q "${NEWNAME}"
> +      if [ $? -ne 0 ] ; then break ; fi

Please decompress the conditional.

> +      NUM=$((NUM+1))

Another bug (see above).

Thanks,
-Garrett