diff options
| author | brian <brian@FreeBSD.org> | 2004-07-08 22:35:36 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 2004-07-08 22:35:36 +0000 |
| commit | aae31dbf3205a16e99cdd85918abc0a16b13a7c4 (patch) | |
| tree | 20232a5e4a3c9e6b2610bd5b43c7e935d7896f38 /sys/nfsclient/nfs_vfsops.c | |
| parent | eeb3c914453162ca5f06e82aeddf24e35a8c86ad (diff) | |
| download | FreeBSD-src-aae31dbf3205a16e99cdd85918abc0a16b13a7c4.zip FreeBSD-src-aae31dbf3205a16e99cdd85918abc0a16b13a7c4.tar.gz | |
Change the following environment variables to kernel options:
bootp -> BOOTP
bootp.nfsroot -> BOOTP_NFSROOT
bootp.nfsv3 -> BOOTP_NFSV3
bootp.compat -> BOOTP_COMPAT
bootp.wired_to -> BOOTP_WIRED_TO
- i.e. back out the previous commit. It's already possible to
pxeboot(8) with a GENERIC kernel.
Pointed out by: dwmalone
Diffstat (limited to 'sys/nfsclient/nfs_vfsops.c')
| -rw-r--r-- | sys/nfsclient/nfs_vfsops.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index ec63a7a..9674628 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -35,6 +35,7 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_bootp.h" #include "opt_nfsroot.h" #include <sys/param.h> @@ -388,23 +389,16 @@ nfs_mountroot(struct mount *mp, struct thread *td) struct nfsv3_diskless *nd = &nfsv3_diskless; struct socket *so; struct vnode *vp; - char *cp; int error, i; u_long l; char buf[128]; GIANT_REQUIRED; /* XXX until socket locking done */ - if ((cp = getenv("bootp")) != NULL) { - freeenv(cp); - if ((cp = getenv("bootp.nfsroot")) != NULL) { - freeenv(cp); - bootpc_init(); /* get nfs_diskless filled in */ - } - } -#if defined(NFS_ROOT) - if (cp == NULL) - nfs_setup_diskless(); +#if defined(BOOTP_NFSROOT) && defined(BOOTP) + bootpc_init(); /* use bootp to get nfs_diskless filled in */ +#elif defined(NFS_ROOT) + nfs_setup_diskless(); #endif if (nfs_diskless_valid == 0) |
