search for: writestr_early

..._reboot-dhcp-pxelinux_run to find out that I was modifing death code. With <patch> --- a/core/pxelinux.asm +++ b/core/pxelinux.asm @@ -259,15 +259,6 @@ _start1: %include "init.inc" ; -; Tell the user we got this far -; - mov si,syslinux_banner - call writestr_early - - mov si,copyright_str - call writestr_early - -; ; Assume API version 2.1, in case we find the !PXE structure without ; finding the PXENV+ structure. This should really look at the Base ; Code ROM ID structure in have_pxe, but this is adequate for now -- </patc...

...current build) in the reset_pxe function. If I call "syslinux_local_boot(0)" (in a COM32 binary) the KeepPXE variable is always 1 which resets the PXE stack instead of unloading it: local_boot: push cs pop ds mov [LocalBootType],ax call vgaclearmode mov si,localboot_msg call writestr_early ; Restore the environment we were called with call reset_pxe . reset_pxe: or byte [KeepPXE],1 ; Fall through unload_pxe: push ds push es mov ax,cs mov ds,ax mov es,ax cmp byte [KeepPXE],0 ; Should we keep PXE around? jne do_reset_pxe ? on Dell Precision M4600 Laptops (BIOS...

...syslinux_banner in isolinux and pxelinux. This is already done in ldlinux and extlinux. Signed-off-by: Sebastian Herbszt <herbszt at gmx.de> diff --git a/core/isolinux.asm b/core/isolinux.asm index ef7d92d..23429bd 100644 --- a/core/isolinux.asm +++ b/core/isolinux.asm @@ -1034,7 +1034,7 @@ writestr_early equ writestr ; Data that needs to be in the first sector ; ----------------------------------------------------------------------------- -syslinux_banner db CR, LF, 'ISOLINUX ', VERSION_STR, ' ', DATE_STR, ' ', 0 +syslinux_banner db CR, LF, MY_NAME, ' ', VERSION_...

...h syslinux.cfg ... mov [CurrentDir],eax ; ... the current directory diff --git a/core/pxelinux.asm b/core/pxelinux.asm index 4398582..95c5bee 100644 --- a/core/pxelinux.asm +++ b/core/pxelinux.asm @@ -704,6 +704,15 @@ prefix: test byte [DHCPMagic], 04h ; Did we get a path prefix option call writestr_early call crlf + ; Set CurrentDirName + push di + mov si,PathPrefix + mov di,CurrentDirName + call strcpy + sub di,2 + mov byte[di],0 + pop di + ; ; Load configuration file ;

...,eax + stc +.done: + pop bp + pop ecx +.end: ret section .bss diff --git a/core/pxelinux.asm b/core/pxelinux.asm index aac1ec2..94f23af 100644 --- a/core/pxelinux.asm +++ b/core/pxelinux.asm @@ -704,6 +704,13 @@ prefix: test byte [DHCPMagic], 04h ; Did we get a path prefix option call writestr_early call crlf + ; Set CurrentDirName + push di + mov si,PathPrefix + mov di,CurrentDirName + call strcpy + pop di + ; ; Load configuration file ; diff --git a/doc/comboot.txt b/doc/comboot.txt index 5329502..387303d 100644 --- a/doc/comboot.txt +++ b/doc/comboot.txt @@ -921,3 +921,46 @@ AX...

From: Matt Fleming <matt.fleming at intel.com> Here are the patches that I've got queued up based on the very helpful feedback I received from people testing Syslinux 5.00-pre9. Unless anyone has any concerns these will make it into Syslinux 5.00-pre10. Matt Fleming (9): pxe: Don't call open_config() from the pxe core ldlinux: Print a warning if no config file is found

...se_dir xor eax,eax + stc +.done: + pop ecx ret section .bss diff --git a/core/pxelinux.asm b/core/pxelinux.asm index 4398582..9836a1e 100644 --- a/core/pxelinux.asm +++ b/core/pxelinux.asm @@ -704,6 +704,13 @@ prefix: test byte [DHCPMagic], 04h ; Did we get a path prefix option call writestr_early call crlf + ; Set CurrentDirName + push di + mov si,PathPrefix + mov di,CurrentDirName + call strcpy + pop di + ; ; Load configuration file ; diff --git a/doc/comboot.txt b/doc/comboot.txt index ceee93a..135064c 100644 --- a/doc/comboot.txt +++ b/doc/comboot.txt @@ -908,3 +908,42 @@ AX...

Hi, These patches contain support for some features that are already in Syslinux 4 but weren't working properly on the elflink branch. It's another step closer to feature parity with Syslinux 4. Having to jump through the comboot API for localboot support is less than ideal and I'll eventually fix that, probably when we move a big chunk of code from asm to C. Also, there's a