From owner-svn-src-all@FreeBSD.ORG Wed Dec 18 21:13:51 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 525E7BA1; Wed, 18 Dec 2013 21:13:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3E6BD1530; Wed, 18 Dec 2013 21:13:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBILDpYZ075973; Wed, 18 Dec 2013 21:13:51 GMT (envelope-from dteske@svn.freebsd.org) Received: (from dteske@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBILDpeM075972; Wed, 18 Dec 2013 21:13:51 GMT (envelope-from dteske@svn.freebsd.org) Message-Id: <201312182113.rBILDpeM075972@svn.freebsd.org> From: Devin Teske Date: Wed, 18 Dec 2013 21:13:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r259570 - head/usr.sbin/bsdinstall/scripts X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Dec 2013 21:13:51 -0000 Author: dteske Date: Wed Dec 18 21:13:50 2013 New Revision: 259570 URL: http://svnweb.freebsd.org/changeset/base/259570 Log: Fix "[: -eq: argument expected" error introduced by SVN r256343. The code should not have used DIALOG_CANCEL because dialog.subr wasn't included to define it. The effect of the error was that you could not cancel the partition dialog. Discovered by checking bsdinstall_log for something else. MFC after: 3 days Modified: head/usr.sbin/bsdinstall/scripts/auto Modified: head/usr.sbin/bsdinstall/scripts/auto ============================================================================== --- head/usr.sbin/bsdinstall/scripts/auto Wed Dec 18 20:37:49 2013 (r259569) +++ head/usr.sbin/bsdinstall/scripts/auto Wed Dec 18 21:13:50 2013 (r259570) @@ -124,8 +124,7 @@ exec 3>&1 PARTMODE=`echo $PMODES | xargs dialog --backtitle "FreeBSD Installer" \ --title "Partitioning" \ --menu "How would you like to partition your disk?" \ - 0 0 0 2>&1 1>&3` -if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi + 0 0 0 2>&1 1>&3` || exit 1 exec 3>&- case "$PARTMODE" in