diff options
| author | jkh <jkh@FreeBSD.org> | 1996-06-08 07:02:21 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-06-08 07:02:21 +0000 |
| commit | 2a03e988da43e97ce7ad936d8d66606c4db8e434 (patch) | |
| tree | 9d5e42a609d74826c3430900e01edf845acf1643 /usr.sbin/sysinstall/media.c | |
| parent | f26a3ce6a2a8fbc774d07ae08e9f77d87500f70f (diff) | |
| download | FreeBSD-src-2a03e988da43e97ce7ad936d8d66606c4db8e434.zip FreeBSD-src-2a03e988da43e97ce7ad936d8d66606c4db8e434.tar.gz | |
Make CDROMs automagically select as the default media type.
If you're running multi-user, check off items in the packages menu
based on whether or not they're actually installed.
Diffstat (limited to 'usr.sbin/sysinstall/media.c')
| -rw-r--r-- | usr.sbin/sysinstall/media.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c index d61654d..cd5d9c6 100644 --- a/usr.sbin/sysinstall/media.c +++ b/usr.sbin/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 |
