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

Provide an error message instead of silent failure if no disks are present

Browse Source 
in the system.

PR:		bin/161950
MFC after:	3 days
This commit is contained in:
nwhitehorn 2011-10-25 16:30:16 +00:00
parent 5179da9b94
commit afe77a15ac
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ main(int argc, const char **argv)
{
struct partition_metadata *md;
const char *prompt;
struct partedit_item *items;
struct partedit_item *items = NULL;
struct gmesh mesh;
int i, op, nitems, nscroll;
int error;
@ -99,12 +99,21 @@ main(int argc, const char **argv)
/* Show the part editor either immediately, or to confirm wizard */
while (1) {
error = geom_gettree(&mesh);
items = read_geom_mesh(&mesh, &nitems);
get_mount_points(items, nitems);
dlg_clear();
dlg_put_backtitle();
error = geom_gettree(&mesh);
if (error == 0)
items = read_geom_mesh(&mesh, &nitems);
if (error || items == NULL) {
dialog_msgbox("Error", "No disks found. If you need to "
"install a kernel driver, choose Shell at the "
"installation menu.", 0, 0, TRUE);
break;
}
get_mount_points(items, nitems);
if (i >= nitems)
i = nitems - 1;
op = diskeditor_show("Partition Editor", prompt,