From: hpa <hpa>
Date: Thu, 8 Mar 2001 06:38:55 +0000 (+0000)
Subject: Actually look at the flag passed to "localboot"
X-Git-Tag: syslinux-1.53-pre3^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a5bcf0c5cd72e7d6f9bd2ffa1fb41677baddc3f;p=platform%2Fupstream%2Fsyslinux.git

Actually look at the flag passed to "localboot"
---

diff --git a/pxelinux.asm b/pxelinux.asm
index d7cb3f4..4deae09 100644
--- a/pxelinux.asm
+++ b/pxelinux.asm
@@ -912,8 +912,11 @@ pc_ipappend:	call getint			; "ipappend" command
 .vk:		mov [VKernelBuf+vk_ipappend],bl
 		jmp short parse_config_2
 
-pc_localboot:	cmp word [VKernelCtr],byte 0	; "localboot" command
-		je parse_config_2		; ("label" section only)
+pc_localboot:	call getint			; "localboot" command
+		and bx,bx
+		jz parse_config_2
+		cmp word [VKernelCtr],byte 0	; ("label" section only)
+		je parse_config_2
 		mov [VKernelBuf+vk_rname], byte 0	; Null kernel name
 		jmp short parse_config_2
 
@@ -933,12 +936,12 @@ pc_timeout:	call getint			; "timeout" command
 		mul bx				; clock ticks per 1/10 s
 		add bx,dx
 		mov [KbdTimeOut],bx
-		jmp short parse_config_2
+parse_config_2:	jmp parse_config
 
 pc_display:	call pc_getfile			; "display" command
 		jz parse_config_2		; File not found?
 		call get_msg_file		; Load and display file
-parse_config_2: jmp parse_config
+		jmp short parse_config_2
 
 pc_prompt:	call getint			; "prompt" command
 		jc parse_config_2