From e47f61e18396b6e5f61ee91b9f9f832976ee96cf Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Sat, 2 Sep 2000 19:17:34 +0000
Subject: Avoid the modules madness I inadvertently introduced by making the
 cloning infrastructure standard in kern_conf.  Modules are now the same with
 or without devfs support.

If you need to detect if devfs is present, in modules or elsewhere,
check the integer variable "devfs_present".

This happily removes an ugly hack from kern/vfs_conf.c.

This forces a rename of the eventhandler and the standard clone
helper function.

Include <sys/eventhandler.h> in <sys/conf.h>: it's a helper #include
like <sys/queue.h>

Remove all #includes of opt_devfs.h they no longer matter.
---
 sys/kern/init_main.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'sys/kern/init_main.c')

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 0229c56..1a2644b 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -43,7 +43,6 @@
  */
 
 #include "opt_init_path.h"
-#include "opt_devfs.h"
 
 #include <sys/param.h>
 #include <sys/file.h>
@@ -62,6 +61,7 @@
 #include <sys/vmmeter.h>
 #include <sys/unistd.h>
 #include <sys/malloc.h>
+#include <sys/conf.h>
 
 #include <machine/cpu.h>
 
@@ -499,10 +499,11 @@ start_init(void *dummy)
 		(void)subyte(--ucp, 'C');
 		options = 1;
 #endif
-#ifdef DEVFS
-		(void)subyte(--ucp, 'd');
-		options = 1;
-#endif
+		if (devfs_present) {
+			(void)subyte(--ucp, 'd');
+			options = 1;
+		}
+
 		if (options == 0)
 			(void)subyte(--ucp, '-');
 		(void)subyte(--ucp, '-');		/* leading hyphen */
-- 
cgit v1.1