summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Cosgrove <tom@cvs.openbsd.org>2005-03-13 22:07:24 +0000
committerTom Cosgrove <tom@cvs.openbsd.org>2005-03-13 22:07:24 +0000
commit5a95a46e64448648fbbd7489b46fe30548eaca3f (patch)
tree9011d691e45e4a05f51428e11c95f5125df50955
parent0e1b8a8f4f6dc6170b9dc91d0eb3067826d242bf (diff)
Only use bangpxe calling on PXE 2.1 and above. Makes no difference on
current-spec PXE systems, but allows some older ones (I tested 0.98 and 0.99) to get a bit further. ok weingart@; "please get it in" deraadt@.
-rw-r--r--sys/arch/i386/stand/libsa/pxe.c4
-rw-r--r--sys/arch/i386/stand/pxeboot/conf.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/i386/stand/libsa/pxe.c b/sys/arch/i386/stand/libsa/pxe.c
index 9a193416ef5..b3ed0bd1fec 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.2 2005/03/12 21:53:49 tom Exp $ */
+/* $OpenBSD: pxe.c,v 1.3 2005/03/13 22:07:23 tom Exp $ */
/* $NetBSD: pxe.c,v 1.5 2003/03/11 18:29:00 drochner Exp $ */
/*
@@ -399,7 +399,7 @@ pxe_init(int quiet)
}
}
- if (pxe != NULL) {
+ if (pxenv == NULL) {
pxe_call = pxecall_bangpxe;
bangpxe_off = pxe->EntryPointSP.offset;
bangpxe_seg = pxe->EntryPointSP.segment;
diff --git a/sys/arch/i386/stand/pxeboot/conf.c b/sys/arch/i386/stand/pxeboot/conf.c
index 3f078842c0d..ebde7d92e27 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.2 2005/03/12 21:52:02 tom Exp $ */
+/* $OpenBSD: conf.c,v 1.3 2005/03/13 22:07:23 tom Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -46,7 +46,7 @@
#include "pxeboot.h"
#include "pxe_net.h"
-const char version[] = "1.01";
+const char version[] = "1.02";
int debug = 1;
#undef _TEST