diff options
| author | hpa <hpa> | 2002-06-15 05:24:25 +0000 |
|---|---|---|
| committer | hpa <hpa> | 2002-06-15 05:24:25 +0000 |
| commit | 172f1e3aae1ce8848ad4bb9574d1837d75b67ff5 (patch) | |
| tree | ee31d6aeb3b33e3ae2b229feaa432edac9ec709e /runkernel.inc | |
| parent | 7cc2b27d059d8e06f0216c002868654f5f4a2acc (diff) | |
| download | syslinux-172f1e3aae1ce8848ad4bb9574d1837d75b67ff5.tar.gz | |
Merge in changes from SYSLINUX 1.75syslinux-2.00-pre4
Diffstat (limited to 'runkernel.inc')
| -rw-r--r-- | runkernel.inc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/runkernel.inc b/runkernel.inc index 3ee28f9b..f968168f 100644 --- a/runkernel.inc +++ b/runkernel.inc @@ -145,6 +145,16 @@ get_next_opt: lodsb je is_vga_cmd cmp eax,'mem=' je is_mem_cmd +%if IS_PXELINUX + cmp eax,'keep' ; Is it "keeppxe"? + jne .notkeep + cmp dword [si+3],'ppxe' + jne .notkeep + cmp byte [si+7],' ' ; Must be whitespace or EOS + ja .notkeep + or byte [cs:KeepPXE],1 +.notkeep: +%endif push es ; Save ES -> real_mode_seg push cs pop es ; Set ES <- normal DS @@ -152,6 +162,7 @@ get_next_opt: lodsb mov cx,initrd_cmd_len repe cmpsb jne not_initrd + mov di,InitRD push si ; mangle_dir mangles si call mangle_name ; Mangle ramdisk name |