diff options
| author | jkh <jkh@FreeBSD.org> | 1999-01-20 12:31:43 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-01-20 12:31:43 +0000 |
| commit | 528868027c3f0c1c513a85fc868267ccdbdf452e (patch) | |
| tree | c277fb1899366957a208fa92b274bc6c3c8998f2 /usr.sbin/sysinstall/cdrom.c | |
| parent | 367256e90c185df6c5baa166938dd45c930f5f1a (diff) | |
| download | FreeBSD-src-528868027c3f0c1c513a85fc868267ccdbdf452e.zip FreeBSD-src-528868027c3f0c1c513a85fc868267ccdbdf452e.tar.gz | |
Replace old SAVE_USERCONFIG code with a customized version of Andrzej's
kget code. Also collapse a redundant case in cdrom code.
Diffstat (limited to 'usr.sbin/sysinstall/cdrom.c')
| -rw-r--r-- | usr.sbin/sysinstall/cdrom.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c index f6fe16b..0115202 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.43 1998/10/14 11:23:48 jkh Exp $ + * $Id: cdrom.c,v 1.44 1998/12/22 12:31:24 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -95,10 +95,8 @@ mediaInitCDROM(Device *dev) msgConfirm("Error mounting %s on %s: %s (%u)", dev->devname, mountpoint, strerror(errno), errno); return FALSE; } - cdromMounted = TRUE; } - else - cdromMounted = TRUE; + cdromMounted = TRUE; if (!file_readable(string_concat(mountpoint, "/cdrom.inf")) && !bogusCDOK) { if (msgYesNo("Warning: The CD currently in the drive is either not a FreeBSD\n" |
