diff options
| author | phk <phk@FreeBSD.org> | 1996-12-21 16:43:35 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1996-12-21 16:43:35 +0000 |
| commit | 2e06aeb9e246655bf82511e9f876083301876f7c (patch) | |
| tree | 42b7212a2e183b828f053cc589f6c48dd0db1496 /sys/i386 | |
| parent | ae5c4633974707111deaccca4fce48ed57a8709a (diff) | |
| download | FreeBSD-src-2e06aeb9e246655bf82511e9f876083301876f7c.zip FreeBSD-src-2e06aeb9e246655bf82511e9f876083301876f7c.tar.gz | |
Give MFS_ROOT priority over NFS as root filesystem.
2.2 candidate.
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/autoconf.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index bde3f25..409cda5 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.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) |
