diff options
| author | jkh <jkh@FreeBSD.org> | 1997-01-01 12:36:09 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-01-01 12:36:09 +0000 |
| commit | 9df35f7f8dae1976701a83e7f25a306ca1e96dc7 (patch) | |
| tree | 7c9eaed919b2052c59d74bdf3a7cebd68bf30b04 /usr.sbin/sysinstall/cdrom.c | |
| parent | 5afae04de4c9c8101bcd36608e976a7015b08b0a (diff) | |
| download | FreeBSD-src-9df35f7f8dae1976701a83e7f25a306ca1e96dc7.zip FreeBSD-src-9df35f7f8dae1976701a83e7f25a306ca1e96dc7.tar.gz | |
1. Correct bogon in cdromInit when running multi-user which took cdrom offline
if wrong version.
2. Make sure network device is initialized in ftpInit
3. Eliminate bogus size values in the menus. For now, we'll have to admit
that nobody's added it up yet. In the future, these menus should be
build dynamically anyway, not declared static.
4. Add more debugging to networking code to chase the mystery ppp device
problem.
Diffstat (limited to 'usr.sbin/sysinstall/cdrom.c')
| -rw-r--r-- | usr.sbin/sysinstall/cdrom.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c index 6ab57c2..9756102 100644 --- a/usr.sbin/sysinstall/cdrom.c +++ b/usr.sbin/sysinstall/cdrom.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: cdrom.c,v 1.29 1996/12/12 08:33:35 jkh Exp $ + * $Id: cdrom.c,v 1.30 1996/12/12 16:55:37 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -107,7 +107,8 @@ mediaInitCDROM(Device *dev) cdromMounted = CD_ALREADY_MOUNTED; if (!dontRead && (DITEM_STATUS(attr_parse_file(cd_attr, "/cdrom/cdrom.inf")) == DITEM_FAILURE || !(cp = attr_match(cd_attr, "CD_VERSION")) || strcmp(cp, variable_get(VAR_RELNAME)))) { - unmount("/cdrom", MNT_FORCE); + if (cdromMounted != CD_ALREADY_MOUNTED) + unmount("/cdrom", MNT_FORCE); if (!cp) msgConfirm("Unable to find a /cdrom/cdrom.inf file.\n" "Either this is not a FreeBSD CDROM, there is a problem with\n" @@ -120,7 +121,8 @@ mediaInitCDROM(Device *dev) "(%s).\n\n" "If this is intentional, then please visit the Options editor\n" "to set the boot floppy version string to match that of the CD\n" - "before selecting it as an installation media to avoid this warning", cp, variable_get(VAR_RELNAME)); + "before selecting it as an installation media.", cp, variable_get(VAR_RELNAME)); + return FALSE; } msgDebug("Mounted FreeBSD CDROM on device %s as /cdrom\n", dev->devname); return TRUE; |
