summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/dos.c
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>1995-09-18 16:53:06 +0000
committerpeter <peter@FreeBSD.org>1995-09-18 16:53:06 +0000
commit89e0ab3dba9ef542f52287fd1820072c4de7d393 (patch)
treed8d32666544a3c5d9db7a5472c5fa4292681da66 /usr.sbin/sysinstall/dos.c
parentea496cc61fd7886ad990ab3876ac97ea2530a3bd (diff)
downloadFreeBSD-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/dos.c')
-rw-r--r--usr.sbin/sysinstall/dos.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/sysinstall/dos.c b/usr.sbin/sysinstall/dos.c
index 52ba28e..d4a19a4 100644
--- a/usr.sbin/sysinstall/dos.c
+++ b/usr.sbin/sysinstall/dos.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: dos.c,v 1.5.2.4 1995/06/05 16:59:03 jkh Exp $
+ * $Id: dos.c,v 1.6.2.1 1995/07/21 10:53:52 rgrimes Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -63,7 +63,7 @@ mediaInitDOS(Device *dev)
{
struct msdosfs_args args;
- if (DOSMounted)
+ if (!RunningAsInit || DOSMounted)
return TRUE;
if (Mkdir("/dos", NULL))
@@ -97,7 +97,7 @@ mediaGetDOS(Device *dev, char *file, Attribs *dist_attrs)
void
mediaShutdownDOS(Device *dev)
{
- if (!DOSMounted)
+ if (!RunningAsInit || !DOSMounted)
return;
msgDebug("Unmounting /dos\n");
if (unmount("/dos", MNT_FORCE) != 0)
OpenPOWER on IntegriCloud