Give MFS_ROOT priority over NFS as root filesystem.

2.2 candidate.
This commit is contained in:
Poul-Henning Kamp 1996-12-21 16:43:35 +00:00
parent 0970881ff6
commit 544d046f79
2 changed files with 20 additions and 18 deletions

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.57 1996/12/18 15:03:09 bde Exp $
* $Id: autoconf.c,v 1.58 1996/12/18 18:53:00 bde Exp $
*/
/*
@ -242,14 +242,6 @@ configure(dummy)
}
#endif
#ifdef NFS
if (!mountroot && nfs_diskless_valid) {
if (bootverbose)
printf("Considering NFS root f/s.\n");
mountroot = nfs_mountroot;
}
#endif /* NFS */
#ifdef MFS_ROOT
if (!mountroot) {
if (bootverbose)
@ -268,6 +260,15 @@ configure(dummy)
setroot();
}
#endif
#ifdef NFS
if (!mountroot && nfs_diskless_valid) {
if (bootverbose)
printf("Considering NFS root f/s.\n");
mountroot = nfs_mountroot;
}
#endif /* NFS */
#ifdef FFS
if (!mountroot) {
if (bootverbose)

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.57 1996/12/18 15:03:09 bde Exp $
* $Id: autoconf.c,v 1.58 1996/12/18 18:53:00 bde Exp $
*/
/*
@ -242,14 +242,6 @@ configure(dummy)
}
#endif
#ifdef NFS
if (!mountroot && nfs_diskless_valid) {
if (bootverbose)
printf("Considering NFS root f/s.\n");
mountroot = nfs_mountroot;
}
#endif /* NFS */
#ifdef MFS_ROOT
if (!mountroot) {
if (bootverbose)
@ -268,6 +260,15 @@ configure(dummy)
setroot();
}
#endif
#ifdef NFS
if (!mountroot && nfs_diskless_valid) {
if (bootverbose)
printf("Considering NFS root f/s.\n");
mountroot = nfs_mountroot;
}
#endif /* NFS */
#ifdef FFS
if (!mountroot) {
if (bootverbose)