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

1 files changed, 8 insertions, 11 deletions

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index f5a4164..c646741 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
  * devices are determined (from possibilities mentioned in ioconf.c),
  * and the drivers are initialized.
  */
+#include "opt_bootp.h"
 #include "opt_isa.h"
 #include "opt_nfs.h"
 #include "opt_nfsroot.h"
@@ -142,19 +143,15 @@ configure_final(dummy)
 void
 cpu_rootconf()
 {
-	char	*cp;
-
-	if ((cp = getenv("bootp")) != NULL) {
-        	bootpc_init();
-		freeenv(cp);
-	}
+#ifdef BOOTP
+        bootpc_init();
+#endif
 #if defined(NFSCLIENT) && defined(NFS_ROOT)
-	if ((cp = getenv("bootp.nfsroot")) == NULL)
-		nfs_setup_diskless();
-	if (cp != NULL || nfs_diskless_valid)
+#if !defined(BOOTP_NFSROOT)
+	nfs_setup_diskless();
+	if (nfs_diskless_valid)
+#endif
 		rootdevnames[0] = "nfs:";
-	if (cp != NULL)
-		freeenv(cp);
 #endif
 }
 SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL)