diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-02-10 13:22:40 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2007-02-10 13:22:40 -0800 |
| commit | 14df2f8046001f2dc24e1f65bb17c6e31dfbbd09 (patch) | |
| tree | e1aa9c709cd2e3ff208d2160157bac9f3acff61c /bootsect.inc | |
| parent | 1970446f95df5ac0a0d3b2b0e90b72e0dd353699 (diff) | |
| parent | d48bb2b249d996587cfe6e39e810a9805d013abe (diff) | |
| download | syslinux-3.40-pre5.tar.gz | |
Merge with git+ssh://master.kernel.org/pub/scm/boot/syslinux/syslinux.git#syslinux-3.3xsyslinux-3.40-pre5
Diffstat (limited to 'bootsect.inc')
| -rw-r--r-- | bootsect.inc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bootsect.inc b/bootsect.inc index 16c5f5e9..7c288daf 100644 --- a/bootsect.inc +++ b/bootsect.inc @@ -136,6 +136,11 @@ replace_bootstrap: mov [es:di+12],esi ; New ESI mov [es:di+6],bx ; New DS +%if IS_PXELINUX == 0 + ; DON'T DO THIS FOR PXELINUX... + ; For PXE, ES:BX -> PXENV+, and this would corrupt + ; that use. + ; Hunt for $PnP header if one exists mov ax,0F000h mov fs,ax @@ -163,6 +168,7 @@ replace_bootstrap: ; Found a valid $PnP header, point ES:DI to it mov [es:di+8], bx ; New DI mov [es:di+4], fs ; New ES +%endif .donepnp: pop ax ; Copy list count |