summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authornwhitehorn <nwhitehorn@FreeBSD.org>2011-03-08 01:17:30 +0000
committernwhitehorn <nwhitehorn@FreeBSD.org>2011-03-08 01:17:30 +0000
commit03141e27a347bb775ff2c25daaf20fd774ac0852 (patch)
tree1937730d6fc3eae37d6f39023b60a2fa43ceba82 /usr.sbin
parent28c75d673cd3bd32c3ec740c5e2a352d5c7ff8a5 (diff)
downloadFreeBSD-src-03141e27a347bb775ff2c25daaf20fd774ac0852.zip
FreeBSD-src-03141e27a347bb775ff2c25daaf20fd774ac0852.tar.gz
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.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bsdinstall/partedit/partedit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c
index cb3c018..0ba3203 100644
--- a/usr.sbin/bsdinstall/partedit/partedit.c
+++ b/usr.sbin/bsdinstall/partedit/partedit.c
@@ -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 */
OpenPOWER on IntegriCloud