diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-05-09 16:56:09 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 1999-05-09 16:56:09 +0000 |
| commit | aa713cb89857dba0c38f05a1ed23d056f3626646 (patch) | |
| tree | 67dde5129020544bb68c9c648337cc0b819d0e52 /sys | |
| parent | 04ab695ebf5713e243f7a4937b8122fe44a50610 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 6 | ||||
| -rw-r--r-- | sys/i386/i386/autoconf.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 236d1c3ff6ce..0dff4988f118 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.118 1999/05/09 07:56:36 phk Exp $ + * $Id: autoconf.c,v 1.119 1999/05/09 16:45:49 phk Exp $ */ /* @@ -437,7 +437,11 @@ setroot() char *sname; if (boothowto & RB_DFLTROOT) { +#ifdef ROOTDEVNAME setrootbyname(ROOTDEVNAME); +#else + setconf(); +#endif return; } if ((bootdev & B_MAGICMASK) != B_DEVMAGIC) diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index 236d1c3ff6ce..0dff4988f118 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.118 1999/05/09 07:56:36 phk Exp $ + * $Id: autoconf.c,v 1.119 1999/05/09 16:45:49 phk Exp $ */ /* @@ -437,7 +437,11 @@ setroot() char *sname; if (boothowto & RB_DFLTROOT) { +#ifdef ROOTDEVNAME setrootbyname(ROOTDEVNAME); +#else + setconf(); +#endif return; } if ((bootdev & B_MAGICMASK) != B_DEVMAGIC) |