wok-next rev 2641
gpxe: skip BOOT_IMAGE= from cmdline
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Apr 17 22:12:05 2009 +0200 (2009-04-17) |
parents | 7f1f7efb4ddb |
children | 93cdea384a76 |
files | gpxe/stuff/cmdline.u |
line diff
1.1 --- a/gpxe/stuff/cmdline.u Fri Apr 17 21:08:06 2009 +0200 1.2 +++ b/gpxe/stuff/cmdline.u Fri Apr 17 22:12:05 2009 +0200 1.3 @@ -58,6 +58,25 @@ 1.4 pop %ds 1.5 run_etherboot: 1.6 1.7 +--- gpxe-0.9.3/src/arch/i386/prefix/lkrnprefix.S 1.8 ++++ gpxe-0.9.3/src/arch/i386/prefix/lkrnprefix.S 1.9 +@@ -461,6 +461,15 @@ 1.10 + push %ds 1.11 + pop %es 1.12 + movw $boot_url, %di 1.13 ++ cmpw $0x4F42,(%si) /* skip BOOT_IMAGE=.... */ 1.14 ++ jne copy_cmdline 1.15 ++skip_arg: 1.16 ++ lodsb 1.17 ++ testb $0xDF, %al 1.18 ++ jne skip_arg 1.19 ++ or %al, %al 1.20 ++ jne copy_cmdline 1.21 ++ decw %si 1.22 + copy_cmdline: 1.23 + lodsb 1.24 + stosb 1.25 + 1.26 --- gpxe-0.9.3/src/net/udp/dns.c 1.27 +++ gpxe-0.9.3/src/net/udp/dns.c 1.28 @@ -506,6 +506,19 @@