From owner-svn-src-stable@FreeBSD.ORG Sat Jun 2 18:22:38 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BC07F106566C; Sat, 2 Jun 2012 18:22:38 +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 A43898FC16; Sat, 2 Jun 2012 18:22:38 +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 q52IMcE5004894; Sat, 2 Jun 2012 18:22:38 GMT (envelope-from jpaetzel@svn.freebsd.org) Received: (from jpaetzel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q52IMcaU004892; Sat, 2 Jun 2012 18:22:38 GMT (envelope-from jpaetzel@svn.freebsd.org) Message-Id: <201206021822.q52IMcaU004892@svn.freebsd.org> From: Josh Paetzel Date: Sat, 2 Jun 2012 18:22:38 +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: r236458 - stable/9/usr.sbin/pc-sysinstall/backend X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2012 18:22:38 -0000 Author: jpaetzel Date: Sat Jun 2 18:22:38 2012 New Revision: 236458 URL: http://svn.freebsd.org/changeset/base/236458 Log: MFC 236331 Fix detecting available zpool names. 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 Sat Jun 2 18:13:53 2012 (r236457) +++ stable/9/usr.sbin/pc-sysinstall/backend/functions.sh Sat Jun 2 18:22:38 2012 (r236458) @@ -277,7 +277,7 @@ get_zpool_name() while : do NEWNAME="${BASENAME}${NUM}" - zpool import | grep -qw "${NEWNAME}" && break + zpool import | grep -qw "${NEWNAME}" || break NUM=$((NUM+1)) done