Oops. If ROOTDEVNAME isn't defined, have -r call -a.

This commit is contained in:
Poul-Henning Kamp 1999-05-09 16:56:09 +00:00
parent 04ab695ebf
commit aa713cb898
2 changed files with 10 additions and 2 deletions

View File

@ -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)

View File

@ -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)