From owner-svn-src-all@FreeBSD.ORG  Tue Mar  8 01:17:30 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9D6191065672;
	Tue,  8 Mar 2011 01:17:30 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8B9358FC17;
	Tue,  8 Mar 2011 01:17:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p281HUe3053015;
	Tue, 8 Mar 2011 01:17:30 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p281HUBK053013;
	Tue, 8 Mar 2011 01:17:30 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201103080117.p281HUBK053013@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 8 Mar 2011 01:17:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219391 - head/usr.sbin/bsdinstall/partedit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Mar 2011 01:17:30 -0000

Author: nwhitehorn
Date: Tue Mar  8 01:17:30 2011
New Revision: 219391
URL: http://svn.freebsd.org/changeset/base/219391

Log:
  Only validate the partition setup when the user presses "Save". If the user
  wants to exit without saving, it's not a problem if the disk is set up
  in an invalid way.

Modified:
  head/usr.sbin/bsdinstall/partedit/partedit.c

Modified: head/usr.sbin/bsdinstall/partedit/partedit.c
==============================================================================
--- head/usr.sbin/bsdinstall/partedit/partedit.c	Mon Mar  7 23:52:23 2011	(r219390)
+++ head/usr.sbin/bsdinstall/partedit/partedit.c	Tue Mar  8 01:17:30 2011	(r219391)
@@ -128,7 +128,7 @@ main(int argc, const char **argv) {
 		}
 
 		error = 0;
-		if (op == 5 && validate_setup()) { /* Finished */
+		if (op == 5) { /* Finished */
 			dialog_vars.extra_button = TRUE;
 			dialog_vars.extra_label =
 			    __DECONST(char *, "Abort");
@@ -140,7 +140,7 @@ main(int argc, const char **argv) {
 			dialog_vars.extra_button = FALSE;
 			dialog_vars.ok_label = NULL;
 
-			if (op == 0) { /* Save */
+			if (op == 0 && validate_setup()) { /* Save */
 				error = apply_changes(&mesh);
 				break;
 			} else if (op == 3) { /* Don't save => Quit */