From 10c57556bc95bbc600298e9d44a349c4e1789ba6 Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Tue, 23 Sep 1997 17:14:37 +0000
Subject: [PATCH] Moved setconf() call after root configuration again.  This
 fixes a null pointer panic in the "generic" version of setconf().

Removed the resulting near-duplicate printf.
---
 sys/amd64/amd64/autoconf.c | 7 +++----
 sys/i386/i386/autoconf.c   | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 839ba062638..55df9bb009f 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.75 1997/09/09 12:48:56 jmg Exp $
+ *	$Id: autoconf.c,v 1.76 1997/09/21 21:38:03 gibbs Exp $
  */
 
 /*
@@ -270,10 +270,7 @@ configure(dummy)
 
 		printf("Device configuration finished.\n");
 	}
-	setconf();
 	cold = 0;
-	if (bootverbose)
-		printf("configure() finished.\n");
 }
 
 void
@@ -367,6 +364,8 @@ cpu_rootconf()
 	if (!mountrootfsname) {
 		panic("Nobody wants to mount my root for me");
 	}
+
+	setconf();
 }
 
 void
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 839ba062638..55df9bb009f 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)autoconf.c	7.1 (Berkeley) 5/9/91
- *	$Id: autoconf.c,v 1.75 1997/09/09 12:48:56 jmg Exp $
+ *	$Id: autoconf.c,v 1.76 1997/09/21 21:38:03 gibbs Exp $
  */
 
 /*
@@ -270,10 +270,7 @@ configure(dummy)
 
 		printf("Device configuration finished.\n");
 	}
-	setconf();
 	cold = 0;
-	if (bootverbose)
-		printf("configure() finished.\n");
 }
 
 void
@@ -367,6 +364,8 @@ cpu_rootconf()
 	if (!mountrootfsname) {
 		panic("Nobody wants to mount my root for me");
 	}
+
+	setconf();
 }
 
 void