summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/modules.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.sbin/sysinstall/modules.c')
-rw-r--r--usr.sbin/sysinstall/modules.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/usr.sbin/sysinstall/modules.c b/usr.sbin/sysinstall/modules.c
index 859994a..211c51e 100644
--- a/usr.sbin/sysinstall/modules.c
+++ b/usr.sbin/sysinstall/modules.c
@@ -132,17 +132,13 @@ kldBrowser(dialogMenuItem *self)
err = NULL;
if (DITEM_STATUS(mediaSetFloppy(NULL)) == DITEM_FAILURE) {
- msgConfirm("Unable to set media device to floppy.");
- what |= DITEM_FAILURE;
- mediaClose();
- return what;
+ err = "Unable to set media device to floppy.";
+ goto errout;
}
if (!DEVICE_INIT(mediaDevice)) {
- msgConfirm("Unable to mount floppy filesystem.");
- what |= DITEM_FAILURE;
- mediaClose();
- return what;
+ err = "Unable to mount floppy filesystem.";
+ goto errout;
}
msize = sizeof(DMenu) + (sizeof(dialogMenuItem) * 2);
@@ -191,11 +187,10 @@ kldBrowser(dialogMenuItem *self)
dmenuOpenSimple(menu, FALSE);
- mediaClose();
-
deviceRescan();
errout:
+ mediaClose();
for (i = 0; i < count; i++)
free(menu->items[i].prompt);
OpenPOWER on IntegriCloud