aboutsummaryrefslogtreecommitdiff
path: root/release/sysinstall/media.c
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1996-06-08 07:02:21 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1996-06-08 07:02:21 +0000
commit7b0a4c23a42e0cd8dfe1106fc3f63b14984624f4 (patch)
tree9d5e42a609d74826c3430900e01edf845acf1643 /release/sysinstall/media.c
parent43ebe040febf467d83dce65c59e3351e14a315a8 (diff)
Notes
Diffstat (limited to 'release/sysinstall/media.c')
-rw-r--r--release/sysinstall/media.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c
index d61654d6bc81..cd5d9c66512c 100644
--- a/release/sysinstall/media.c
+++ b/release/sysinstall/media.c
@@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
- * $Id: media.c,v 1.37 1996/04/28 01:07:24 jkh Exp $
+ * $Id: media.c,v 1.38 1996/04/28 03:27:11 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -85,10 +85,11 @@ mediaSetCDROM(dialogMenuItem *self)
devs = deviceFind(NULL, DEVICE_TYPE_CDROM);
cnt = deviceCount(devs);
if (!cnt) {
- msgConfirm("No CDROM devices found! Please check that your system's\n"
- "configuration is correct and that the CDROM drive is of a supported\n"
- "type. For more information, consult the hardware guide\n"
- "in the Doc menu.");
+ if (self) /* Interactive? */
+ msgConfirm("No CDROM devices found! Please check that your system's\n"
+ "configuration is correct and that the CDROM drive is of a supported\n"
+ "type. For more information, consult the hardware guide\n"
+ "in the Doc menu.");
return DITEM_FAILURE | DITEM_CONTINUE;
}
else if (cnt > 1) {
@@ -105,7 +106,7 @@ mediaSetCDROM(dialogMenuItem *self)
}
else
mediaDevice = devs[0];
- return (mediaDevice ? DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE | DITEM_RECREATE;
+ return (mediaDevice ? DITEM_SUCCESS | DITEM_LEAVE_MENU : DITEM_FAILURE) | DITEM_RESTORE | DITEM_RECREATE;
}
static int