From 03141e27a347bb775ff2c25daaf20fd774ac0852 Mon Sep 17 00:00:00 2001 From: nwhitehorn Date: Tue, 8 Mar 2011 01:17:30 +0000 Subject: 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. --- usr.sbin/bsdinstall/partedit/partedit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.sbin') 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 */ -- cgit v1.1