mirror of
https://github.com/freebsd/freebsd-src
synced 2024-11-05 18:22:52 +00:00
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.
This commit is contained in:
parent
8dd4744e1a
commit
10c57556bc
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=29742
2 changed files with 6 additions and 8 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue