diff options
| -rw-r--r-- | sys/arch/amd64/stand/libsa/pxe.c | 8 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/pxeboot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/pxe.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/stand/pxeboot/conf.c | 4 |
4 files changed, 16 insertions, 8 deletions
diff --git a/sys/arch/amd64/stand/libsa/pxe.c b/sys/arch/amd64/stand/libsa/pxe.c index c11b3a00086..58de9a8d305 100644 --- a/sys/arch/amd64/stand/libsa/pxe.c +++ b/sys/arch/amd64/stand/libsa/pxe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxe.c,v 1.3 2005/03/13 22:31:49 tom Exp $ */ +/* $OpenBSD: pxe.c,v 1.4 2006/05/20 22:37:43 deraadt Exp $ */ /* $NetBSD: pxe.c,v 1.5 2003/03/11 18:29:00 drochner Exp $ */ /* @@ -97,6 +97,9 @@ #include <lib/libsa/net.h> #include <lib/libsa/bootp.h> +#include <stand/boot/bootarg.h> +#include <machine/biosvar.h> + #include "pxeboot.h" #include "pxe.h" #include "pxe_netif.h" @@ -221,12 +224,13 @@ pxe_netif_open() pxe_call(PXENV_UDP_OPEN); if (uo->status != PXENV_STATUS_SUCCESS) { - printf("pxe_netif_open: PXENV_UDP_OPEN failed: 0x%x\n", + printf("\npxe_netif_open: PXENV_UDP_OPEN failed: 0x%x\n", uo->status); return -1; } bcopy(bootplayer.CAddr, desc.myea, ETHER_ADDR_LEN); + addbootarg(BOOTARG_BOOTMAC, sizeof(bios_bootmac_t), bootplayer.CAddr); /* * Since the PXE BIOS has already done DHCP, make sure we diff --git a/sys/arch/amd64/stand/pxeboot/conf.c b/sys/arch/amd64/stand/pxeboot/conf.c index 8856243779d..b560722bddb 100644 --- a/sys/arch/amd64/stand/pxeboot/conf.c +++ b/sys/arch/amd64/stand/pxeboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.9 2006/01/02 00:26:29 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.10 2006/05/20 22:37:43 deraadt Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -45,7 +45,7 @@ #include "pxeboot.h" #include "pxe_net.h" -const char version[] = "1.08"; +const char version[] = "1.09"; int debug = 0; #undef _TEST diff --git a/sys/arch/i386/stand/libsa/pxe.c b/sys/arch/i386/stand/libsa/pxe.c index b3ed0bd1fec..554a82b3fcb 100644 --- a/sys/arch/i386/stand/libsa/pxe.c +++ b/sys/arch/i386/stand/libsa/pxe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pxe.c,v 1.3 2005/03/13 22:07:23 tom Exp $ */ +/* $OpenBSD: pxe.c,v 1.4 2006/05/20 22:37:40 deraadt Exp $ */ /* $NetBSD: pxe.c,v 1.5 2003/03/11 18:29:00 drochner Exp $ */ /* @@ -97,6 +97,9 @@ #include <lib/libsa/net.h> #include <lib/libsa/bootp.h> +#include <stand/boot/bootarg.h> +#include <machine/biosvar.h> + #include "pxeboot.h" #include "pxe.h" #include "pxe_netif.h" @@ -221,12 +224,13 @@ pxe_netif_open() pxe_call(PXENV_UDP_OPEN); if (uo->status != PXENV_STATUS_SUCCESS) { - printf("pxe_netif_open: PXENV_UDP_OPEN failed: 0x%x\n", + printf("\npxe_netif_open: PXENV_UDP_OPEN failed: 0x%x\n", uo->status); return -1; } bcopy(bootplayer.CAddr, desc.myea, ETHER_ADDR_LEN); + addbootarg(BOOTARG_BOOTMAC, sizeof(bios_bootmac_t), bootplayer.CAddr); /* * Since the PXE BIOS has already done DHCP, make sure we diff --git a/sys/arch/i386/stand/pxeboot/conf.c b/sys/arch/i386/stand/pxeboot/conf.c index 912efa9493a..98d9851b0ab 100644 --- a/sys/arch/i386/stand/pxeboot/conf.c +++ b/sys/arch/i386/stand/pxeboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.8 2006/01/02 00:26:29 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.9 2006/05/20 22:37:43 deraadt Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -46,7 +46,7 @@ #include "pxeboot.h" #include "pxe_net.h" -const char version[] = "1.07"; +const char version[] = "1.09"; int debug = 1; #undef _TEST |