From 66b368e835f0869b205fe1b1eac3ac3e437c1309 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Thu, 3 Apr 1997 13:44:59 +0000
Subject: [PATCH] Make all this work under -current again. Submitted-By: Chuck
 Robey <chuckr@glue.umd.edu>

---
 release/sysinstall/cdrom.c    | 3 ++-
 release/sysinstall/floppy.c   | 4 +++-
 release/sysinstall/install.c  | 4 +++-
 release/sysinstall/misc.c     | 3 ++-
 usr.sbin/sade/install.c       | 4 +++-
 usr.sbin/sade/misc.c          | 3 ++-
 usr.sbin/sysinstall/cdrom.c   | 3 ++-
 usr.sbin/sysinstall/floppy.c  | 4 +++-
 usr.sbin/sysinstall/install.c | 4 +++-
 usr.sbin/sysinstall/misc.c    | 3 ++-
 10 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c
index 8ecd461a747c..ad5460e87665 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 aa45094c0ea8..d5c5c59dc0f7 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 76d53dc66c02..70333168c1fd 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 6670d520328d..93835fc67139 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>
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 76d53dc66c02..70333168c1fd 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/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/usr.sbin/sade/misc.c b/usr.sbin/sade/misc.c
index 6670d520328d..93835fc67139 100644
--- a/usr.sbin/sade/misc.c
+++ b/usr.sbin/sade/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>
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index 8ecd461a747c..ad5460e87665 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$
+ * $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/usr.sbin/sysinstall/floppy.c b/usr.sbin/sysinstall/floppy.c
index aa45094c0ea8..d5c5c59dc0f7 100644
--- a/usr.sbin/sysinstall/floppy.c
+++ b/usr.sbin/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/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 76d53dc66c02..70333168c1fd 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/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/usr.sbin/sysinstall/misc.c b/usr.sbin/sysinstall/misc.c
index 6670d520328d..93835fc67139 100644
--- a/usr.sbin/sysinstall/misc.c
+++ b/usr.sbin/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>