If you config a kernel with 'config kernel swap generic' and try to

boot diskless with it, you get a panic because setconf() is only
called for mountroot == ffs_mountroot. It really needs to be called
no matter what manner of rootfs we have. I can't really say if
swapgeneric will work with a CD-ROM though. (I get the feeling I'm
the only one who uses swapgeneric these days anyway.)
This commit is contained in:
Bill Paul 1995-05-11 02:50:11 +00:00
parent babb4e927f
commit 2c739e6439
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=8433
2 changed files with 4 additions and 4 deletions

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.26 1995/04/23 09:17:24 julian Exp $
* $Id: autoconf.c,v 1.27 1995/04/25 03:41:12 phk Exp $
*/
/*
@ -199,7 +199,6 @@ configure()
*/
if ((boothowto & RB_ASKNAME) == 0 || rootdev != NODEV)
setroot();
setconf();
}
#endif
if (!mountroot) {
@ -209,6 +208,7 @@ configure()
* Configure swap area and related system
* parameter based on device(s) used.
*/
setconf();
swapconf();
cold = 0;
}

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.26 1995/04/23 09:17:24 julian Exp $
* $Id: autoconf.c,v 1.27 1995/04/25 03:41:12 phk Exp $
*/
/*
@ -199,7 +199,6 @@ configure()
*/
if ((boothowto & RB_ASKNAME) == 0 || rootdev != NODEV)
setroot();
setconf();
}
#endif
if (!mountroot) {
@ -209,6 +208,7 @@ configure()
* Configure swap area and related system
* parameter based on device(s) used.
*/
setconf();
swapconf();
cold = 0;
}