summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-01-14 12:16:38 +0000
committerMatt Fleming <matt.fleming@intel.com>2013-01-14 12:16:38 +0000
commit37f7635bcfd80b805436665e4d6317bbbe8a0430 (patch)
tree1ccb554652bc6fc3c75e9b758dc9fcaeb3286e77
parent17a36e2c91706512e6c425222c9a9a451d9db854 (diff)
downloadsyslinux-37f7635bcfd80b805436665e4d6317bbbe8a0430.tar.gz
PXELINUX: Fix IPAPPEND to include BOOTIF and SYSUUIDsyslinux-5.01-pre2
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@intel.com>
-rw-r--r--core/pxelinux.asm4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index 097b856c..a7333ce6 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