summaryrefslogtreecommitdiffstats
path: root/sys/conf
diff options
context:
space:
mode:
authorbrian <brian@FreeBSD.org>2004-07-08 22:35:36 +0000
committerbrian <brian@FreeBSD.org>2004-07-08 22:35:36 +0000
commitaae31dbf3205a16e99cdd85918abc0a16b13a7c4 (patch)
tree20232a5e4a3c9e6b2610bd5b43c7e935d7896f38 /sys/conf
parenteeb3c914453162ca5f06e82aeddf24e35a8c86ad (diff)
downloadFreeBSD-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/conf')
-rw-r--r--sys/conf/NOTES9
-rw-r--r--sys/conf/files4
-rw-r--r--sys/conf/options5
3 files changed, 15 insertions, 3 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index e1cbcad..fd1b42a 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2124,7 +2124,14 @@ device pps
device lpbb
device pcfclock
-# Kernel BOOTP support - see loader(8)
+# Kernel BOOTP support
+
+options BOOTP # Use BOOTP to obtain IP address/hostname
+ # Requires NFSCLIENT and NFS_ROOT
+options BOOTP_NFSROOT # NFS mount root filesystem using BOOTP info
+options BOOTP_NFSV3 # Use NFS v3 to NFS mount root
+options BOOTP_COMPAT # Workaround for broken bootp daemons.
+options BOOTP_WIRED_TO=fxp0 # Use interface fxp0 for BOOTP
#
# Add tie-ins for a hardware watchdog. This only enables the hooks;
diff --git a/sys/conf/files b/sys/conf/files
index 1638778..7237d64 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1573,8 +1573,8 @@ netsmb/smb_trantcp.c optional netsmb
netsmb/smb_usr.c optional netsmb
nfs/nfs_common.c optional nfsclient
nfs/nfs_common.c optional nfsserver
-nfsclient/bootp_subr.c standard
-nfsclient/krpc_subr.c optional nfsclient
+nfsclient/bootp_subr.c optional bootp nfsclient
+nfsclient/krpc_subr.c optional bootp nfsclient
nfsclient/nfs_bio.c optional nfsclient
nfsclient/nfs_diskless.c optional nfsclient nfs_root
nfsclient/nfs_node.c optional nfsclient
diff --git a/sys/conf/options b/sys/conf/options
index 71cf0fe..b593318 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -310,6 +310,11 @@ ALTQ_CDNR opt_altq.h
ALTQ_PRIQ opt_altq.h
ALTQ_NOPCC opt_altq.h
ALTQ_DEBUG opt_altq.h
+BOOTP opt_bootp.h
+BOOTP_COMPAT opt_bootp.h
+BOOTP_NFSROOT opt_bootp.h
+BOOTP_NFSV3 opt_bootp.h
+BOOTP_WIRED_TO opt_bootp.h
BRIDGE opt_bdg.h
DEV_PF opt_pf.h
DEV_PFLOG opt_pf.h
OpenPOWER on IntegriCloud