mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-22 11:17:19 +00:00
Code Issues Releases Activity

Avoid some "Invalid argument" errors in the installer.

Browse Source 
PR:		bin/161926
MFC after:	5 days
This commit is contained in:
Nathan Whitehorn 2011-10-23 16:57:10 +00:00
parent f9629bc4cd
commit 987415b113
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=226666
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
usr.sbin/bsdinstall/partedit/gpart_ops.c
View File

@ -392,8 +392,14 @@ gpart_destroy(struct ggeom *lg_geom)
gctl_ro_param(r, "force", sizeof(force), &force);
gctl_ro_param(r, "verb", -1, "destroy");
errstr = gctl_issue(r);
if (errstr != NULL && errstr[0] != '\0')
gpart_show_error("Error", NULL, errstr);
if (errstr != NULL && errstr[0] != '\0') {
/*
* Check if we reverted away the existence of the geom
* altogether. Show all other errors to the user.
*/
if (strtol(errstr, NULL, 0) != EINVAL)
gpart_show_error("Error", NULL, errstr);
}
gctl_free(r);
/* And any metadata associated with the partition scheme itself */
@ -450,6 +456,10 @@ gpart_edit(struct gprovider *pp)
return;
}
/* If this is a nested partition, edit as usual */
if (strcmp(pp->lg_geom->lg_class->lg_name, "PART") == 0)
break;
/* Destroy the geom and all sub-partitions */
gpart_destroy(cp->lg_geom);
@ -507,7 +517,7 @@ gpart_edit(struct gprovider *pp)
choice = dlg_form("Edit Partition", "", 0, 0, 0, nitems, items, &junk);
if (choice) /* Cancel pressed */
return;
goto endedit;
/* Check if the label has a / in it */
if (strchr(items[3].text, '/') != NULL) {
@ -538,6 +548,13 @@ gpart_edit(struct gprovider *pp)
items[2].text, (strcmp(oldtype, items[0].text) != 0) ?
newfs : NULL);
endedit:
if (strcmp(oldtype, items[0].text) != 0 && cp != NULL)
gpart_destroy(cp->lg_geom);
if (strcmp(oldtype, items[0].text) != 0 && strcmp(items[0].text,
"freebsd") == 0)
gpart_partition(pp->lg_name, "BSD");
for (i = 0; i < (sizeof(items) / sizeof(items[0])); i++)
if (items[i].text_free)
free(items[i].text);