search for: is_pxelinux

> Pushed. Thank you for digging so deeply on this. > Gene, For the c32 modules to be able to use the keeppxe option, and considering that the issue in v.5.+ is that 'IS_PXELINUX' is/was dead code, is there any chance that the code in: com32/modules/whichsys.c would help? I mean, as a different way of detecting the Syslinux variant. In fact, the original idea of having the code in whichsys.c librarized is probably still relevant. TIA, Ady.

...yslinux-6.04-pre1/com32/elflink/ldlinux/kernel.c 2016-06-08 20:08:43.000000000 -0700 > @@ -48,14 +48,6 @@ int new_linux_kernel(char *okernel, char > > sprintf(cmdline, "BOOT_IMAGE=%s %s", kernel_name, args); > > - /* "keeppxe" handling */ > -#if IS_PXELINUX > - extern char KeepPXE; > - > - if (strstr(cmdline, "keeppxe")) > - KeepPXE |= 1; > -#endif > - > if (strstr(cmdline, "quiet")) > opt_quiet = true; > > --- syslinux-6.04-pre1.orig/com32/lib/syslinux...

...016-03-01 21:06:02.000000000 -0800 +++ syslinux-6.04-pre1/com32/elflink/ldlinux/kernel.c 2016-06-08 20:08:43.000000000 -0700 @@ -48,14 +48,6 @@ int new_linux_kernel(char *okernel, char sprintf(cmdline, "BOOT_IMAGE=%s %s", kernel_name, args); - /* "keeppxe" handling */ -#if IS_PXELINUX - extern char KeepPXE; - - if (strstr(cmdline, "keeppxe")) - KeepPXE |= 1; -#endif - if (strstr(cmdline, "quiet")) opt_quiet = true; --- syslinux-6.04-pre1.orig/com32/lib/syslinux/load_linux.c 2016-03-01 21:06:02.000000000 -0800 +++ syslinux-6.04-pre1/com32/lib/syslinux/...

...; -; Local boot supported -; -%assign HAS_LOCALBOOT 1 - -; ; log2(Max filename size Including final null) ; FILENAME_MAX_LG2 equ 8 diff --git a/core/keywords.inc b/core/keywords.inc index d0f7db3..bd482f2 100644 --- a/core/keywords.inc +++ b/core/keywords.inc @@ -94,8 +94,6 @@ keywd_table: %if IS_PXELINUX keyword ipappend, pc_ipappend %endif -%if HAS_LOCALBOOT keyword localboot, pc_localboot -%endif keywd_count equ ($-keywd_table)/keywd_size diff --git a/core/localboot.inc b/core/localboot.inc index a66cf20..1fe3102 100644 --- a/core/localboot.inc +++ b/core/localboot.inc @@ -16,8 +16,6 @@...

On Sun, Mar 05, 2017 at 05:39:42PM -0500, Gene Cumm wrote: > Adam, how about https://github.com/geneC/syslinux/compare/keeppxe ? I > changed to using strstr() and a uint16_t (to match the called > function) Hi Gene, Looks fine. Thanks. -- Adam

Hello, I'm having a challenge with increasing vmalloc memory beyond 512M using pxelinux.0 to boot. This config works fine: --- # Configuration file # linux-2.6.20-1.2962.fc6 DEFAULT linux LABEL linux kernel kernels/vmlinuz-2.6.20-1.2962.fc6 append initrd=initrds/bladeinitrd-2.6.20-1.2962.fc6.img enforcing=0 vmalloc=512M --- If I increase vmalloc to 513M, I get errors

...-31 22:45:26.000000000 +0200 +++ syslinux-3.71-27-g3d39943/core/ui.inc 2008-08-31 22:51:44.000000000 +0200 @@ -108,6 +108,8 @@ not_ascii: cmp al,0Dh ; Enter je command_done + cmp al,09h ; Tab + je display_labels cmp al,'F' & 1Fh ; <Ctrl-F> je set_func_flag %if IS_PXELINUX @@ -142,6 +144,48 @@ mov byte [FuncFlag],1 jmp short get_char_2 +display_labels: + cmp word [LabelCompl],1 ; Label completion enabled? + jnz get_char_2 + mov cx,di + sub cx,command_line + call crlf + mov esi,[HighMemSize] ; Start from top of memory +.scan: + cmp esi,[VKernelEnd] +...

...+; the macaddr aus configfilename, only try full maccaddr, then vendor part +; (first 3 byte), then defaultfilename: dirty hack, USE AT YOUR OWN RISK +; but free or better try to integrate into stable release +; **************************************************************************** %define IS_PXELINUX 1 %include "macros.inc" @@ -692,22 +697,39 @@ mov si,cfgprefix mov cx,cfgprefix_len rep movsb - mov cx,8 - mov eax,[MyIP] + mov cx,6 ; 6 nibbles in vendor part of MAC +...

...t;esi.l; + } + printf("\n"); + return; +} diff --git a/core/extern.inc b/core/extern.inc index 64edea6..58d0f27 100644 --- a/core/extern.inc +++ b/core/extern.inc @@ -24,6 +24,9 @@ ; newconfig.c extern pm_is_config_file + ; display_labels.c + extern pm_display_labels + %if IS_PXELINUX ; pxe.c extern unload_pxe, reset_pxe diff --git a/core/include/core.h b/core/include/core.h index 7db5daf..8d77b52 100644 --- a/core/include/core.h +++ b/core/include/core.h @@ -14,6 +14,9 @@ extern char ConfigName[]; extern char KernelName[]; extern char cmd_line[]; extern char ConfigFile[]...

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

From: Matt Fleming <matt.fleming at intel.com> Since we can't use __intcall() for EFI, and since we can now have the ELF module code resolve all our symbols at runtime, we should delete as many references to __intcall() as possible and just access the symbols directly. The most interesting patch is the support for weak symbols. We need to be able to reference derivative-specific

...ff --git a/core/diskfs.inc b/core/diskfs.inc index 02382cc..dcbc924 100644 --- a/core/diskfs.inc +++ b/core/diskfs.inc @@ -109,9 +109,9 @@ PXERetry dw 0 ; Extra PXE retries section .data16 global SerialNotice SerialNotice db 1 ; Only print this once + global IPAppends, numIPAppends %if IS_PXELINUX extern IPOption - global IPAppends, numIPAppends alignz 2 IPAppends dw IPOption numIPAppends equ ($-IPAppends)/2 diff --git a/core/elflink/advwrite.c b/core/elflink/advwrite.c deleted file mode 100644 index 4152eea..0000000 --- a/core/elflink/advwrite.c +++ /dev/null @@ -1,45 +0,0 @@ -/* -...