Date: Wed, 18 Dec 2013 21:13:51 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r259570 - head/usr.sbin/bsdinstall/scripts Message-ID: <201312182113.rBILDpeM075972@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312182113.rBILDpeM075972>