[syslinux:elflink] PXELINUX: Fix IPAPPEND to include BOOTIF and SYSUUID

syslinux-bot for Matt Fleming matt.fleming at intel.com
Mon Jan 14 07:30:04 PST 2013


Commit-ID:  37f7635bcfd80b805436665e4d6317bbbe8a0430
Gitweb:     http://www.syslinux.org/commit/37f7635bcfd80b805436665e4d6317bbbe8a0430
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Mon, 14 Jan 2013 12:16:38 +0000
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Mon, 14 Jan 2013 12:16:38 +0000

PXELINUX: Fix IPAPPEND to include BOOTIF and SYSUUID

commit 14531c47bc95 ("core: Delete code that is duplicated in
ldlinux") erroneously deleted the BOOTIFStr and SYSUUIDStr entries
from the PXELINUX-version of IPAppends, meaning that IPAPPEND 3 and
IPAPPEND 4 didn't append the corresponding strings to the command
line.

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 core/pxelinux.asm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index 097b856..a7333ce 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -290,10 +290,12 @@ KernelType	resb 1			; Kernel type, from vkernel, if known
 		global KernelName
 KernelName	resb FILENAME_MAX	; Mangled name for kernel
 		section .data16
-		extern IPOption
+		extern IPOption, BOOTIFStr, SYSUUIDStr
 		global IPAppends, numIPAppends
 		alignz 2
 IPAppends	dw IPOption
+		dw BOOTIFStr
+		dw SYSUUIDStr
 numIPAppends	equ ($-IPAppends)/2
 
 		section .text16


More information about the Syslinux-commits mailing list