search for: defaultlevel

The new directive doesn't seem to work here. Looks like DefaultLevel is never changed: core/parseconfig.inc:pc_default: cmp ax,[DefaultLevel] core/parseconfig.inc:DefaultLevel dw 0 ; The current level of default core/ui.inc: cmp word [DefaultLevel],1 ; Active UI statement? - Sebastian diff --git a/core/parseconfig....

..., 1 deletions(-) diff --git a/com32/elflink/ldlinux/ldlinux.c b/com32/elflink/ldlinux/ldlinux.c index 85066b1..a23b2f3 100644 --- a/com32/elflink/ldlinux/ldlinux.c +++ b/com32/elflink/ldlinux/ldlinux.c @@ -65,7 +65,7 @@ static int ldlinux_main(int argc, char **argv) /* * Auto boot */ - if (defaultlevel || !noescape) { + if (defaultlevel || noescape) { if (defaultlevel) { load_kernel(); /* Shouldn't return */ } else {

...urned. + */ + retval = setjmp(__return_to_command_prompt); + if (retval == 0) + load_kernel(cmdline); /* Shouldn't return */ + } else { + retval = setjmp(__return_to_command_prompt); + if (retval == 0) { + if (!forceprompt && !shift_is_held()) + ldlinux_auto_boot(); - if (defaultlevel > 1) - ldlinux_auto_boot(); + if (defaultlevel > 1) + ldlinux_auto_boot(); + } + } + retval = setjmp(__return_to_command_prompt); ldlinux_enter_command(); return 0; } -- 2.6.1

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 linux.intel.com> This is a series of patches that, * shrink the core by moving things into an ldlinux ELF module * begin wiring up some of the C versions of various functions The core now only contains essential code and loads the ldlinux module to do everything else, like providing a command line interface and loading kernels. The config file parsing

From: Sylvain Gault <sylvain.gault at gmail.com> Hello there, I propose 2 patches that fix two possible stack overflows either when running a COM32 module or when loading a new config file. I didn't find a better way to do this than to use the infamous setjmp/longjmp functions to restore the stack to a previous state. This makes the logic a bit more complex, but the behavior is not

...ce set; clear it and * then execute the boot-once. */ - const char *cmdline; char *src, *dst; size_t i; @@ -270,12 +272,14 @@ int main(int argc __unused, char **argv __unused) if (forceprompt) goto cmdline; + cmdline = default_cmd; +auto_boot: /* * Auto boot */ if (defaultlevel || noescape) { if (defaultlevel) { - load_kernel(default_cmd); /* Shouldn't return */ + load_kernel(cmdline); /* Shouldn't return */ } else { printf("No DEFAULT or UI configuration directive found!\n"); @@ -285,8 +289,12 @@ int main(int argc __unused, char **argv _...

...word in configuration file: ',0 err_noparm db 'Missing parameter in configuration file. Keyword: ',0 diff --git a/core/parseconfig.inc b/core/parseconfig.inc index fcf18d9..57ee5a5 100644 --- a/core/parseconfig.inc +++ b/core/parseconfig.inc @@ -26,7 +26,9 @@ pc_default: cmp ax,[DefaultLevel] mov di,default_cmd call getline mov byte [di-1],0 ; null-terminate -.skip: ret + ret +.skip: call skipline + ret ; ; "ontimeout" command

...- execute(cmdline, KT_COM32); + execute(cmdline, IMAGE_TYPE_COM32); } } @@ -225,6 +223,35 @@ static void enter_cmdline(void) } } +void ldlinux_enter_command(bool prompt) +{ + const char *cmdline = default_cmd; + + if (prompt) + goto cmdline; +auto_boot: + /* + * Auto boot + */ + if (defaultlevel || noescape) { + if (defaultlevel) { + load_kernel(cmdline); /* Shouldn't return */ + } else { + printf("No DEFAULT or UI configuration directive found!\n"); + + if (noescape) + kaboom(); + } + } + +cmdline: + /* Only returns if the user pressed enter or input timed out */...