diff options
| author | msmith <msmith@FreeBSD.org> | 1999-11-01 23:55:38 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 1999-11-01 23:55:38 +0000 |
| commit | 2ba600f7675082d5e06fef618e50d6725f0492d1 (patch) | |
| tree | 761babed4a21e25bd5af6161657b0afe68c18553 | |
| parent | fd0aded94f3b90e54247bb4fb2e06f7bab58d6d4 (diff) | |
| download | FreeBSD-src-2ba600f7675082d5e06fef618e50d6725f0492d1.zip FreeBSD-src-2ba600f7675082d5e06fef618e50d6725f0492d1.tar.gz | |
Call bootpc_init before we try to mount an NFS root, if we're configured
to use BOOTP for NFS root discovery.
The entire interface setup inside nfs_mountroot is evil, and should die.
| -rw-r--r-- | sys/nfs/nfs_vfsops.c | 6 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vfsops.c | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index d63f38d..dc9e053 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -37,6 +37,8 @@ * $FreeBSD$ */ +#include "opt_bootp.h" + #include <sys/param.h> #include <sys/sockio.h> #include <sys/proc.h> @@ -399,6 +401,10 @@ nfs_mountroot(mp) u_long l; char buf[128]; +#if defined(BOOTP_NFSROOT) && defined(BOOTP) + bootpc_init(); /* use bootp to get nfs_diskless filled in */ +#endif + /* * XXX time must be non-zero when we init the interface or else * the arp code will wedge... diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index d63f38d..dc9e053 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -37,6 +37,8 @@ * $FreeBSD$ */ +#include "opt_bootp.h" + #include <sys/param.h> #include <sys/sockio.h> #include <sys/proc.h> @@ -399,6 +401,10 @@ nfs_mountroot(mp) u_long l; char buf[128]; +#if defined(BOOTP_NFSROOT) && defined(BOOTP) + bootpc_init(); /* use bootp to get nfs_diskless filled in */ +#endif + /* * XXX time must be non-zero when we init the interface or else * the arp code will wedge... |
