diff options
author | brian <brian@FreeBSD.org> | 2004-07-08 13:40:33 +0000 |
---|---|---|
committer | brian <brian@FreeBSD.org> | 2004-07-08 13:40:33 +0000 |
commit | 2821a50eaafae3e4c7204aef9e58c6f40d221bbb (patch) | |
tree | ebac46b3b358807a8144fabd366380413a43366c /sys/alpha | |
parent | 7c245468ef2fa07526f2540ec91012b5c7f4e9c8 (diff) | |
download | FreeBSD-src-2821a50eaafae3e4c7204aef9e58c6f40d221bbb.zip FreeBSD-src-2821a50eaafae3e4c7204aef9e58c6f40d221bbb.tar.gz |
Change the following kernel options to environment variables:
BOOTP -> bootp
BOOTP_NFSROOT -> bootp.nfsroot
BOOTP_NFSV3 -> bootp.nfsv3
BOOTP_COMPAT -> bootp.compat
BOOTP_WIRED_TO -> bootp.wired_to
This lets you PXE boot with a GENERIC kernel by putting this sort of thing
in loader.conf:
bootp="YES"
bootp.nfsroot="YES"
bootp.nfsv3="YES"
bootp.wired_to="bge1"
or even setting the variables manually from the OK prompt.
Diffstat (limited to 'sys/alpha')
-rw-r--r-- | sys/alpha/alpha/autoconf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/alpha/alpha/autoconf.c b/sys/alpha/alpha/autoconf.c index d3ffb23..0cf7e65 100644 --- a/sys/alpha/alpha/autoconf.c +++ b/sys/alpha/alpha/autoconf.c @@ -27,7 +27,6 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include "opt_bootp.h" #include "opt_isa.h" #include "opt_nfs.h" #include "opt_nfsroot.h" @@ -203,11 +202,12 @@ void cpu_rootconf() { #if defined(NFSCLIENT) && defined(NFS_ROOT) - int order = 0; -#if !defined(BOOTP_NFSROOT) - if (nfs_diskless_valid) -#endif - rootdevnames[order++] = "nfs:"; + char *cp = NULL; + + if (nfs_diskless_valid || (cp = getenv("bootp.nfsroot")) != NULL) + rootdevnames[0] = "nfs:"; + if (cp != NULL) + freeenv(cp); #endif } SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL) |