diff options
| author | peter <peter@FreeBSD.org> | 1995-09-18 16:53:06 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1995-09-18 16:53:06 +0000 |
| commit | 89e0ab3dba9ef542f52287fd1820072c4de7d393 (patch) | |
| tree | d8d32666544a3c5d9db7a5472c5fa4292681da66 /usr.sbin/sysinstall/cdrom.c | |
| parent | ea496cc61fd7886ad990ab3876ac97ea2530a3bd (diff) | |
| download | FreeBSD-src-89e0ab3dba9ef542f52287fd1820072c4de7d393.zip FreeBSD-src-89e0ab3dba9ef542f52287fd1820072c4de7d393.tar.gz | |
This mega-commit brings in Jordan's latest sysinstall version..
This looks like it was developed offline, and is being spammed over the
top of the existing. "That's fine by me! I dont really care how you do
it, just get it in there..." said Jordan in a conversation a short while
ago...
Diffstat (limited to 'usr.sbin/sysinstall/cdrom.c')
| -rw-r--r-- | usr.sbin/sysinstall/cdrom.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c index 0a65097..03cef9f 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.6.2.3 1995/06/05 12:03:44 jkh Exp $ + * $Id: cdrom.c,v 1.7.2.2 1995/07/21 11:45:32 rgrimes Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -66,7 +66,7 @@ mediaInitCDROM(Device *dev) struct iso_args args; struct stat sb; - if (cdromMounted) + if (!RunningAsInit || cdromMounted) return TRUE; if (Mkdir("/cdrom", NULL)) @@ -88,7 +88,7 @@ mediaInitCDROM(Device *dev) */ if (stat("/cdrom/dists", &sb)) { if (errno == ENOENT) { - msgConfirm("Couldn't locate the directory `dists' on the CD.\nIs this a 2.0.5 CDROM?\n"); + msgConfirm("Couldn't locate the directory `dists' on the CD.\nIs this a FreeBSD CDROM?\n"); return FALSE; } else { @@ -115,7 +115,7 @@ mediaGetCDROM(Device *dev, char *file, Attribs *dist_attrs) void mediaShutdownCDROM(Device *dev) { - if (!cdromMounted) + if (!RunningAsInit || !cdromMounted) return; msgDebug("Unmounting /cdrom\n"); if (unmount("/cdrom", MNT_FORCE) != 0) |
