Working on version 1.54.syslinux-1.54-pre1

Fix spec-bug-induced bug in finding the !PXE structure if PXENV+ was found.

3 files changed, 7 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 8775f5f7..a0ad693c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 Starting with 1.47, changes marked with SYSLINUX/PXELINUX apply to
 that specific program only; other changes apply to both.
 
+Changes in 1.54:
+	* PXELINUX: Fix code for finding !PXE from PXENV+.  This was
+	  due to a spec bug; match the most recent spec since that
+	  seems to be what implementations actually do.
+
 Changes in 1.53:
 	* PXELINUX: Rename pxelinux.bin to pxelinux.0, to match what
 	  most PXE servers seem to expect.
diff --git a/pxelinux.asm b/pxelinux.asm
index 42ed972a..6a937544 100644
--- a/pxelinux.asm
+++ b/pxelinux.asm
@@ -468,7 +468,7 @@ have_pxenv:
 		jb old_api
 		mov si,bx
 		mov ax,es
-		les bx,[es:bx+26h]		; !PXE structure pointer
+		les bx,[es:bx+28h]		; !PXE structure pointer
 		cmp dword [es:bx],'!PXE'
 		je have_pxe
 
diff --git a/version b/version
index 74df8b16..108a9ade 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.53
+1.54