d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only validate the partition setup when the user presses "Save". If the user

Browse Source 
wants to exit without saving, it's not a problem if the disk is set up
in an invalid way.
This commit is contained in:
Nathan Whitehorn 2011-03-08 01:17:30 +00:00
parent 7b8b6c9c46
commit 3b613c28c5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/bsdinstall/partedit/partedit.c
View File

@ -128,7 +128,7 @@ main(int argc, const char **argv) {
} }
error = 0; error = 0;
if (op == 5 && validate_setup()) { /* Finished */ if (op == 5) { /* Finished */
dialog_vars.extra_button = TRUE; dialog_vars.extra_button = TRUE;
dialog_vars.extra_label = dialog_vars.extra_label =
__DECONST(char *, "Abort"); __DECONST(char *, "Abort");
@ -140,7 +140,7 @@ main(int argc, const char **argv) {
dialog_vars.extra_button = FALSE; dialog_vars.extra_button = FALSE;
dialog_vars.ok_label = NULL; dialog_vars.ok_label = NULL;
if (op == 0) { /* Save */ if (op == 0 && validate_setup()) { /* Save */
error = apply_changes(&mesh); error = apply_changes(&mesh);
break; break;
} else if (op == 3) { /* Don't save => Quit */ } else if (op == 3) { /* Don't save => Quit */