Date: Sun, 2 Jun 2013 23:15:12 +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: r251274 - head/usr.sbin/bsdconfig/share Message-ID: <201306022315.r52NFCGk093008@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Sun Jun 2 23:15:12 2013 New Revision: 251274 URL: http://svnweb.freebsd.org/changeset/base/251274 Log: Fix a bug in which the user's choice to Cancel was not properly recognized. Modified: head/usr.sbin/bsdconfig/share/mustberoot.subr Modified: head/usr.sbin/bsdconfig/share/mustberoot.subr ============================================================================== --- head/usr.sbin/bsdconfig/share/mustberoot.subr Sun Jun 2 23:12:32 2013 (r251273) +++ head/usr.sbin/bsdconfig/share/mustberoot.subr Sun Jun 2 23:15:12 2013 (r251274) @@ -176,8 +176,12 @@ f_become_root_via_sudo() retval=$? # Catch X11-related errors - [ $retval -eq 255 ] && + if [ $retval -eq 255 ]; then f_die $retval "$password" + elif [ $retval -ne 0 ]; then + # User cancelled + exit $retval + fi else password=$( $DIALOG \ --title "$DIALOG_TITLE" \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306022315.r52NFCGk093008>