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

Don't present the user with spurious errors when overwriting a disk with

Browse Source 
a deleted, but uncommitted, gpart.

Reported by:	brucec
This commit is contained in:
Nathan Whitehorn 2011-02-19 15:22:06 +00:00
parent 9c73eae9c4
commit da42677d68
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.sbin/bsdinstall/partedit/part_wizard.c
View File

@ -213,6 +213,10 @@ wizard_partition(struct gmesh *mesh, const char *disk)
} }
} }
/* Treat uncommitted scheme deletions as no scheme */
if (scheme != NULL && strcmp(scheme, "(none)") == 0)
scheme = NULL;
query: query:
dialog_vars.yes_label = "Entire Disk"; dialog_vars.yes_label = "Entire Disk";
dialog_vars.no_label = "Partition"; dialog_vars.no_label = "Partition";
@ -247,8 +251,9 @@ query:
scheme = default_scheme(); scheme = default_scheme();
} }
if (scheme == NULL || strcmp(scheme, "(none)") == 0 || choice == 0) { if (scheme == NULL || choice == 0) {
if (gpart != NULL) { /* Erase partitioned disk */ if (gpart != NULL && scheme != NULL) {
/* Erase partitioned disk */
choice = dialog_yesno("Confirmation", "This will erase " choice = dialog_yesno("Confirmation", "This will erase "
"the disk. Are you sure you want to proceed?", 0, 0); "the disk. Are you sure you want to proceed?", 0, 0);
if (choice != 0) if (choice != 0)