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

Improve error handling and remove an unnecessary check on geom provider

Browse Source 
type. GEOM provider names can't duplicate (or shouldn't -- devfs will either
break or only use the first one if they do) so using the first provider
by that name is a sufficient check. This also lets the scripted partitioner
install onto gmirror and geli and such things.
This commit is contained in:
Nathan Whitehorn 2013-01-22 17:06:28 +00:00
parent f89d608184
commit f0ddc92d27
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,12 +167,6 @@ provider_for_name(struct gmesh *mesh, const char *name)
struct ggeom *gp; struct ggeom *gp;
LIST_FOREACH(classp, &mesh->lg_class, lg_class) { LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
if (strcmp(classp->lg_name, "DISK") != 0 &&
strcmp(classp->lg_name, "PART") != 0 &&
strcmp(classp->lg_name, "RAID") != 0 &&
strcmp(classp->lg_name, "MD") != 0)
continue;
LIST_FOREACH(gp, &classp->lg_geom, lg_geom) { LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
if (LIST_EMPTY(&gp->lg_provider)) if (LIST_EMPTY(&gp->lg_provider))
continue; continue;

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

@ -97,8 +97,12 @@ main(int argc, const char **argv)
"the Finish button."; "the Finish button.";
part_wizard(); part_wizard();
} else if (strcmp(basename(argv[0]), "scriptedpart") == 0) { } else if (strcmp(basename(argv[0]), "scriptedpart") == 0) {
scripted_editor(argc, argv); error = scripted_editor(argc, argv);
prompt = NULL; prompt = NULL;
if (error != 0) {
end_dialog();
return (error);
}
} else { } else {
prompt = "Create partitions for FreeBSD. No changes will be " prompt = "Create partitions for FreeBSD. No changes will be "
"made until you select Finish."; "made until you select Finish.";

22
usr.sbin/bsdinstall/partedit/scripted.c
View File

@ -45,12 +45,6 @@ provider_for_name(struct gmesh *mesh, const char *name)
struct ggeom *gp; struct ggeom *gp;
LIST_FOREACH(classp, &mesh->lg_class, lg_class) { LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
if (strcmp(classp->lg_name, "DISK") != 0 &&
strcmp(classp->lg_name, "PART") != 0 &&
strcmp(classp->lg_name, "RAID") != 0 &&
strcmp(classp->lg_name, "MD") != 0)
continue;
LIST_FOREACH(gp, &classp->lg_geom, lg_geom) { LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
if (LIST_EMPTY(&gp->lg_provider)) if (LIST_EMPTY(&gp->lg_provider))
continue; continue;
@ -81,6 +75,11 @@ part_config(char *disk, const char *scheme, char *config)
scheme = default_scheme(); scheme = default_scheme();
error = geom_gettree(&mesh); error = geom_gettree(&mesh);
if (provider_for_name(&mesh, disk) == NULL) {
fprintf(stderr, "GEOM provider %s not found\n", disk);
geom_deletetree(&mesh);
return (-1);
}
/* Remove any existing partitioning and create new scheme */ /* Remove any existing partitioning and create new scheme */
LIST_FOREACH(classp, &mesh.lg_class, lg_class) LIST_FOREACH(classp, &mesh.lg_class, lg_class)
@ -183,7 +182,7 @@ int parse_disk_config(char *input)
} while (input != NULL && *input != 0); } while (input != NULL && *input != 0);
if (disk != NULL) if (disk != NULL)
part_config(disk, scheme, partconfig); return (part_config(disk, scheme, partconfig));
return (0); return (0);
} }
@ -192,7 +191,7 @@ int
scripted_editor(int argc, const char **argv) scripted_editor(int argc, const char **argv)
{ {
char *token; char *token;
int i, len = 0; int i, error = 0, len = 0;
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
len += strlen(argv[i]) + 1; len += strlen(argv[i]) + 1;
@ -203,8 +202,11 @@ scripted_editor(int argc, const char **argv)
strcat(input, argv[i]); strcat(input, argv[i]);
} }
while ((token = strsep(&input, ";")) != NULL) while ((token = strsep(&input, ";")) != NULL) {
parse_disk_config(token); error = parse_disk_config(token);
if (error != 0)
return (error);
}
return (0); return (0);
} }