svn commit: r219391 - head/usr.sbin/bsdinstall/partedit

[Nathan Whitehorn]

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 */