diff options
| author | wpaul <wpaul@FreeBSD.org> | 1995-05-11 02:50:11 +0000 |
|---|---|---|
| committer | wpaul <wpaul@FreeBSD.org> | 1995-05-11 02:50:11 +0000 |
| commit | 40f38f6b58e37805bd02e9035d2c73904d5d5774 (patch) | |
| tree | f3ea15a68d75aeaed5e5dc0db6de7f728203ac0e | |
| parent | 7499b6c1c74057921b76cf9fb0fe8ba4285d2700 (diff) | |
| download | FreeBSD-src-40f38f6b58e37805bd02e9035d2c73904d5d5774.zip FreeBSD-src-40f38f6b58e37805bd02e9035d2c73904d5d5774.tar.gz | |
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.)
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 4 | ||||
| -rw-r--r-- | sys/i386/i386/autoconf.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index cb627e0..65a505e 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.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; } diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index cb627e0..65a505e 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.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; } |
