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/ia64 | |
| 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/ia64')
| -rw-r--r-- | sys/ia64/ia64/autoconf.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/sys/ia64/ia64/autoconf.c b/sys/ia64/ia64/autoconf.c index df2e03b..dcfd1b0 100644 --- a/sys/ia64/ia64/autoconf.c +++ b/sys/ia64/ia64/autoconf.c @@ -26,6 +26,7 @@ * $FreeBSD$ */ +#include "opt_bootp.h" #include "opt_isa.h" #include "opt_nfs.h" #include "opt_nfsroot.h" @@ -53,7 +54,9 @@ static void configure(void *); SYSINIT(configure, SI_SUB_CONFIGURE, SI_ORDER_THIRD, configure, NULL) +#ifdef BOOTP void bootpc_init(void); +#endif #ifdef DEV_ISA #include <isa/isavar.h> @@ -96,18 +99,18 @@ configure(void *dummy) void cpu_rootconf() { - char *cp; +#if defined(NFSCLIENT) && defined(NFS_ROOT) + int order = 0; +#endif - if ((cp = getenv("bootp")) != NULL) { - bootpc_init(); - freeenv(cp); - cp = NULL; - } +#ifdef BOOTP + bootpc_init(); +#endif #if defined(NFSCLIENT) && defined(NFS_ROOT) - if (nfs_diskless_valid || (cp = getenv("bootp.nfsroot")) != NULL) - rootdevnames[0] = "nfs:"; - if (cp != NULL) - freeenv(cp); +#if !defined(BOOTP_NFSROOT) + if (nfs_diskless_valid) +#endif + rootdevnames[order++] = "nfs:"; #endif } SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL) |
