Fix bugs in chainloading other NBPs from pxelinux

diff --git a/NEWS b/NEWS
index 86d6492..2ec93bb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Changes in 2.07:
          address of the boot interface to the kernel as a
          command-line option.
        * mkdiskimage: fix the generation of the end limit.
+       * PXELINUX: Fix bug in chainloading of other NBPs.
 
 Changes in 2.06:
        * ALL: Fix problem that would occationally cause a

diff --git a/bcopy32.inc b/bcopy32.inc
index c3be39a..5425408 100644 (file)
--- a/bcopy32.inc
+++ b/bcopy32.inc
@@ -387,7 +387,7 @@ try_wbinvd:
 ;
 ; Inputs:
 ;      ESI, EDI, ECX   - same as bcopy
-;      On stack        - initial state (ad, fd, ds, es, fs, gs)
+;      On stack        - initial state (fd, ad, ds, es, fs, gs)
 ;
 %define ADJUST (__bcopy_start - trackbuf)
 
@@ -441,7 +441,7 @@ bcopy_over_self:
                pop fs
                pop es
                pop ds
-               popfd
                popad
+               popfd
                jmp 0:7c00h
 __bcopy_end:

diff --git a/bootsect.inc b/bootsect.inc
index afa6568..2fca781 100644 (file)
--- a/bootsect.inc
+++ b/bootsect.inc
@@ -93,8 +93,8 @@ load_bootsec:
                lss sp,[InitStack]      ; Reset stack to PXE original
 %else
                mov esp,7C00h
-               pushad
                pushfd
+               pushad
                push bx ; ds
                push bx ; es
                push bx ; fs

diff --git a/comboot.doc b/comboot.doc
index d262e56..96155ba 100644 (file)
--- a/comboot.doc
+++ b/comboot.doc
@@ -144,6 +144,9 @@ invoked via a FAR CALL.
 SYSLINUX provides the following API calls.  SYSLINUX 1.xx only
 supported INT 20h - terminate program.
 
+NOTE: Most of the API functionality is still experimental.  Expect to
+find bugs.
+
 
        ++++ DOS-COMPATIBLE API CALLS ++++