diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-05-20 22:38:53 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-05-20 22:38:53 +0000 |
| commit | 71adbf45e0e11c71feb213db6438efcd1c992d23 (patch) | |
| tree | 92f685f565f954a16704e2b129b3e56202fa081f /sys | |
| parent | be01b9a244a6eeeb4dc3218c8c2092425570821f (diff) | |
handle BOOTARG_BOOTMAC from boot block; tested by reyk
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/amd64/machdep.c | 11 | ||||
| -rw-r--r-- | sys/arch/i386/i386/bios.c | 11 |
2 files changed, 20 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index f99d65de2c6..d75e33dffb6 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.47 2006/03/15 21:03:37 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.48 2006/05/20 22:38:52 deraadt Exp $ */ /* $NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $ */ /*- @@ -218,6 +218,10 @@ typedef struct _boot_args32 { #define BOOTARGC_MAX NBPG /* one page */ +#ifdef NFSCLIENT +bios_bootmac_t *bios_bootmac; +#endif + /* locore copies the arguments from /boot to here for us */ char bootinfo[BOOTARGC_MAX]; int bootinfo_size = BOOTARGC_MAX; @@ -1953,6 +1957,11 @@ getbootinfo(char *bootinfo, int bootinfo_size) cnset(cdp->consdev); } break; +#ifdef NFSCLIENT + case BOOTARG_BOOTMAC: + bios_bootmac = (bios_bootmac_t *)q->ba_arg; + break; +#endif default: #ifdef BOOTINFO_DEBUG diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c index d34c1e2fcd0..867a99e13f4 100644 --- a/sys/arch/i386/i386/bios.c +++ b/sys/arch/i386/i386/bios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bios.c,v 1.64 2006/05/19 04:49:17 gwk Exp $ */ +/* $OpenBSD: bios.c,v 1.65 2006/05/20 22:38:52 deraadt Exp $ */ /* * Copyright (c) 1997-2001 Michael Shalayeff @@ -94,6 +94,9 @@ struct smbios_entry smbios_entry; #ifdef MULTIPROCESSOR void *bios_smpinfo; #endif +#ifdef NFSCLIENT +bios_bootmac_t *bios_bootmac; +#endif void smbios_info(char*); @@ -397,6 +400,12 @@ bios_getopt() break; #endif +#ifdef NFSCLIENT + case BOOTARG_BOOTMAC: + bios_bootmac = (bios_bootmac_t *)q->ba_arg; + break; +#endif + default: #ifdef BIOS_DEBUG printf(" unsupported arg (%d) %p", q->ba_type, |