summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1997-04-03 13:44:59 +0000
committerjkh <jkh@FreeBSD.org>1997-04-03 13:44:59 +0000
commit207189b145d836b3c2d643b5a68a17524b98dac6 (patch)
tree5be5b779275d1606b92de24589eebbb3aa2a347e /release
parent2640b3cdf34cefeca8badeab66e2ad9d492e9e54 (diff)
downloadFreeBSD-src-207189b145d836b3c2d643b5a68a17524b98dac6.zip
FreeBSD-src-207189b145d836b3c2d643b5a68a17524b98dac6.tar.gz
Make all this work under -current again.
Submitted-By: Chuck Robey <chuckr@glue.umd.edu>
Diffstat (limited to 'release')
-rw-r--r--release/sysinstall/cdrom.c3
-rw-r--r--release/sysinstall/floppy.c4
-rw-r--r--release/sysinstall/install.c4
-rw-r--r--release/sysinstall/misc.c3
4 files changed, 10 insertions, 4 deletions
diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c
index 8ecd461..ad5460e 100644
--- a/release/sysinstall/cdrom.c
+++ b/release/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$
+ * $Id: cdrom.c,v 1.38 1997/02/22 14:11:12 peter Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -49,6 +49,7 @@
#define CD9660
#include <sys/mount.h>
+#include <isofs/cd9660/cd9660_mount.h>
#undef CD9660
static Boolean cdromMounted;
diff --git a/release/sysinstall/floppy.c b/release/sysinstall/floppy.c
index aa45094..d5c5c59 100644
--- a/release/sysinstall/floppy.c
+++ b/release/sysinstall/floppy.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: floppy.c,v 1.23 1997/02/22 14:11:40 peter Exp $
+ * $Id: floppy.c,v 1.24 1997/03/19 10:09:16 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -49,8 +49,10 @@
#define MSDOSFS
#include <sys/mount.h>
+#include <msdosfs/msdosfsmount.h>
#undef MSDOSFS
+#include <ufs/ufs/ufsmount.h>
static Device *floppyDev;
static Boolean floppyMounted;
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 76d53dc..7033316 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: install.c,v 1.134.2.40 1997/03/28 02:25:14 jkh Exp $
+ * $Id: install.c,v 1.180 1997/04/02 12:07:32 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -45,6 +45,8 @@
#include <sys/param.h>
#define MSDOSFS
#include <sys/mount.h>
+#include <ufs/ufs/ufsmount.h>
+#include <msdosfs/msdosfsmount.h>
#undef MSDOSFS
#include <sys/stat.h>
#include <unistd.h>
diff --git a/release/sysinstall/misc.c b/release/sysinstall/misc.c
index 6670d52..93835fc 100644
--- a/release/sysinstall/misc.c
+++ b/release/sysinstall/misc.c
@@ -1,7 +1,7 @@
/*
* Miscellaneous support routines..
*
- * $Id: misc.c,v 1.32 1997/02/22 14:12:08 peter Exp $
+ * $Id: misc.c,v 1.33 1997/03/09 22:25:47 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -42,6 +42,7 @@
#include <sys/wait.h>
#include <sys/param.h>
#include <sys/mount.h>
+#include <ufs/ufs/ufsmount.h>
#include <sys/reboot.h>
#include <sys/dkbad.h>
#include <sys/disklabel.h>
OpenPOWER on IntegriCloud