From 19060a3ad9d30c4ae221ef701ce9a6e1986b5ca6 Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Mon, 28 Oct 1996 11:34:57 +0000
Subject: [PATCH] init_main.c:	pass -d to init if DEVFS_ROOT kern_conf.c:
 gd driver is a disk. vfs_subr.c:	include opt_devfs.h

---
 sys/kern/init_main.c  | 8 +++++++-
 sys/kern/kern_conf.c  | 4 +++-
 sys/kern/vfs_export.c | 3 ++-
 sys/kern/vfs_subr.c   | 3 ++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 2339bf2d880f..a0234f993e49 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -39,10 +39,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)init_main.c	8.9 (Berkeley) 1/21/94
- * $Id: init_main.c,v 1.49 1996/09/23 04:37:54 peter Exp $
+ * $Id: init_main.c,v 1.50 1996/10/20 21:01:46 alex Exp $
  */
 
 #include "opt_rlimit.h"
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/filedesc.h>
@@ -596,6 +597,11 @@ start_init(p, framep)
 		(void)subyte(--ucp, 'C');
 		options = 1;
 #endif
+
+#if defined(DEVFS) && defined(DEVFS_ROOT)
+		(void)subyte(--ucp, 'd');
+		options = 1;
+#endif
 		if (options == 0)
 			(void)subyte(--ucp, '-');
 		(void)subyte(--ucp, '-');		/* leading hyphen */
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index ede49b56aa61..5f31d6c599d4 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_conf.c,v 1.10 1996/07/23 21:52:06 phk Exp $
+ * $Id: kern_conf.c,v 1.11 1996/08/19 19:22:25 julian Exp $
  */
 
 #include <sys/param.h>
@@ -76,6 +76,7 @@ isdisk(dev, type)
 	case 18:		/* ata */
 	case 19:		/* wcd */
 	case 20:		/* od */
+	case 22:		/* gd */
 		if (type == VBLK)
 			return (1);
 		return (0);
@@ -88,6 +89,7 @@ isdisk(dev, type)
 	case 46:		/* matcd */
 	case 69:		/* wcd */
 	case 70:		/* od */
+	case 78:		/* gd */
 		if (type == VCHR)
 			return (1);
 		/* fall through */
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 3e0479d47520..856a503b9574 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,13 +36,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
- * $Id: vfs_subr.c,v 1.62 1996/10/17 02:49:24 dyson Exp $
+ * $Id: vfs_subr.c,v 1.63 1996/10/17 17:56:07 jkh Exp $
  */
 
 /*
  * External virtual filesystem routines
  */
 #include "opt_ddb.h"
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 3e0479d47520..856a503b9574 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,13 +36,14 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.13 (Berkeley) 4/18/94
- * $Id: vfs_subr.c,v 1.62 1996/10/17 02:49:24 dyson Exp $
+ * $Id: vfs_subr.c,v 1.63 1996/10/17 17:56:07 jkh Exp $
  */
 
 /*
  * External virtual filesystem routines
  */
 #include "opt_ddb.h"
+#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>