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/boot | |
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/boot')
-rw-r--r-- | sys/boot/common/dev_net.c | 2 | ||||
-rw-r--r-- | sys/boot/common/loader.8 | 23 | ||||
-rw-r--r-- | sys/boot/forth/loader.conf | 5 |
3 files changed, 1 insertions, 29 deletions
diff --git a/sys/boot/common/dev_net.c b/sys/boot/common/dev_net.c index 2e136c4..b7ccbca 100644 --- a/sys/boot/common/dev_net.c +++ b/sys/boot/common/dev_net.c @@ -273,7 +273,7 @@ net_getparams(sock) /* * If present, strip the server's address off of the rootpath * before passing it along. This allows us to be compatible with - * the kernel's diskless (kenv bootp.nfsroot=1) booting conventions + * the kernel's diskless (BOOTP_NFSROOT) booting conventions */ for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) if (rootpath[i] == ':') diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8 index 958b33b..a77a828 100644 --- a/sys/boot/common/loader.8 +++ b/sys/boot/common/loader.8 @@ -352,29 +352,6 @@ by the kernel during the boot phase. List of semicolon-separated search path for bootable kernels. The default is .Dq Li kernel;kernel.old . -.It Va bootp -Setting this variable tells the kernel to use BOOTP to obtain an IP address -and hostname at boot time. -The kernel must be built with -.Dv NFSCLIENT -and -.Dv NFS_ROOT -defined. -.It Va bootp.compat -Setting this variable enables a workaround for broken BOOTP daemons. -.It Va bootp.nfsroot -Setting this variable tells the kernel to NFS mount the root filesystem using -BOOTP information. -.It Va bootp.nfsv3 -Setting this variable tells the kernel to use NFS version 3 to mount the root -filesystem. -.It Va bootp.wired_to -This variable may be set to the name of the interface that is to be used to -boot from when -.Va bootp -is set. -If it is not set, the system will attempt to boot from all available -interfaces, using the first one found. .It Va console Defines the current console. .It Va currdev diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index db43699..992ab06 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -67,11 +67,6 @@ module_path="/boot/kernel;/boot/modules" # Set the module search path #boot_single="" # Start system in single-user mode #boot_userconfig="" # Run kernel's interactive device configuration program #boot_verbose="" # Causes extra debugging information to be printed -#bootp="" # Use BOOTP to obtain an IP address at boot time -#bootp.compat="" # Enable a workaround for broken bootp daemons -#bootp.nfsroot="" # NFS mount the root filesystem using BOOTP info -#bootp.nfsv3="" # Use NFS v3 to mount the root filesystem -#bootp.wired_to="fxp0" # Use this interface only when bootp is enabled #init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/stand/sysinstall" # Sets the list of init candidates #dumpdev="ad0s1b" # Set device for crash dumps |