diff options
author | bde <bde@FreeBSD.org> | 1997-09-23 17:14:37 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1997-09-23 17:14:37 +0000 |
commit | 3f761f51a5755997eb92d2c007868ed6d1fdd4ae (patch) | |
tree | 74f2767988ff88145b3a734a63eab2c2e022d4f2 /sys/amd64 | |
parent | 42d6eb63b1189951701b5b3d70a21b6fcdf91041 (diff) | |
download | FreeBSD-src-3f761f51a5755997eb92d2c007868ed6d1fdd4ae.zip FreeBSD-src-3f761f51a5755997eb92d2c007868ed6d1fdd4ae.tar.gz |
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.
Diffstat (limited to 'sys/amd64')
-rw-r--r-- | sys/amd64/amd64/autoconf.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 839ba06..55df9bb 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 |