search for: default_cmd

...py(cmdline, p); len = strlen(cmdline); diff --git a/com32/elflink/ldlinux/config.h b/com32/elflink/ldlinux/config.h index cab4c70..b15a082 100644 --- a/com32/elflink/ldlinux/config.h +++ b/com32/elflink/ldlinux/config.h @@ -35,6 +35,7 @@ extern short nohalt; //idle.inc extern const char *default_cmd; //"default" command line extern const char *onerror; //"onerror" command line +extern const char *ontimeout; //"ontimeout" command line extern void cat_help_file(int key); extern struct menu_entry *find_label(const char *str); diff --git a/com32/elflink/ldlinux/l...

.../ldlinux/config.h index 7765266..37c57da 100644 --- a/com32/elflink/ldlinux/config.h +++ b/com32/elflink/ldlinux/config.h @@ -33,7 +33,7 @@ extern short vkernel; //have we seen any "label" statements? extern short displaycon; //conio.inc extern short nohalt; //idle.inc -extern char *default_cmd; //"default" command line -extern char *onerror; //"onerror" command line +extern const char *default_cmd; //"default" command line +extern const char *onerror; //"onerror" command line #endif /* __CONFIG_H__ */ diff --git a/com32/elflink/ldlinux/getadv.c...

...diff -ur syslinux-3.31.orig/parseconfig.inc syslinux-3.31/parseconfig.inc --- syslinux-3.31.orig/parseconfig.inc 2006-09-26 00:52:22.000000000 -0400 +++ syslinux-3.31/parseconfig.inc 2007-01-03 16:34:19.000000000 -0500 @@ -20,7 +20,20 @@ ; ; "default" command ; -pc_default: mov di,default_cmd +pc_default: cmp byte [HasDefault64],0 ; Check if we accepted 'default64' + ja pc_getline ; If so, do nothing + mov di,default_cmd + call getline + mov byte [di-1],0 ; null-terminate + ret + +; +; "default64" command +; +pc_default64: cmp byte [Is64Bit],0 ; Make sure cpu...

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

The following changes since commit 8c576f1fe03e34879921311f46613a35c6530000: Merge remote-tracking branch 'mfleming/for-hpa/elflink/fix-compiler-warnings' into elflink (2011-03-16 12:53:58 -0700) are available in the git repository at: git://git.zytor.com/users/mfleming/syslinux.git for-hpa/elflink/ldlinux Matt Fleming (1): ldlinux: Perform auto-boot if NOESCAPE set in config

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

...- Sebastian diff --git a/core/parseconfig.inc b/core/parseconfig.inc index 2fb26fd..fcf18d9 100644 --- a/core/parseconfig.inc +++ b/core/parseconfig.inc @@ -22,6 +22,7 @@ ; pc_default: cmp ax,[DefaultLevel] jb .skip + mov [DefaultLevel],ax mov di,default_cmd call getline mov byte [di-1],0 ; null-terminate

...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

....new/parseconfig.inc 2009-03-20 13:51:17.000000000 -0700 @@ -393,6 +393,7 @@ section .latebss alignb 4 ; For the good of REP MOVSD +FromFlag resb 1 ; ADP: becomes '-' for serial, '+' for kbd command_line resb max_cmd_len+2 ; Command line buffer alignb 4 default_cmd resb max_cmd_len+1 ; "default" command line --- s_yslinux-3.11.orig/ui.inc 2005-08-30 15:54:14.000000000 -0700 +++ s_yslinux-3.11.new/ui.inc 2009-03-20 15:12:45.000000000 -0700 @@ -196,6 +196,13 @@ ; First we need to mangle the kernel name the way DOS would... ; mov si,command_line +...

...87,7 @@ static void load_kernel(const char *command_line) free((void *)kernel); kernel = k; - type = parse_kernel_type(kernel); + type = parse_image_type(kernel); } } @@ -204,7 +202,7 @@ bad_kernel: */ if (onerrorlen) { rsprintf(&cmdline, "%s %s", onerror, default_cmd); - 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...

...0xFF && len < MAX_CMDLINE_LEN - 1) { diff --git a/com32/elflink/ldlinux/config.h b/com32/elflink/ldlinux/config.h index 37c57da..8f708f1 100644 --- a/com32/elflink/ldlinux/config.h +++ b/com32/elflink/ldlinux/config.h @@ -36,4 +36,6 @@ extern short nohalt; //idle.inc extern const char *default_cmd; //"default" command line extern const char *onerror; //"onerror" command line +extern void cat_help_file(int key); + #endif /* __CONFIG_H__ */ diff --git a/com32/elflink/ldlinux/ldlinux.c b/com32/elflink/ldlinux/ldlinux.c index 85066b1..1177ef5 100644 --- a/com32/elflink/ld...

...ory address used ; This symbol should be used by loaders to indicate @@ -470,6 +471,7 @@ IPAppend db 0 ; Default IPAPPEND option section .uibss alignb 4 ; For the good of REP MOVSD +global command_line command_line resb max_cmd_len+2 ; Command line buffer alignb 4 default_cmd resb max_cmd_len+1 ; "default" command line diff --git a/core/ui.inc b/core/ui.inc index 2d44447..3e28dac 100644 --- a/core/ui.inc +++ b/core/ui.inc @@ -150,44 +150,8 @@ set_func_flag: display_labels: cmp word [NoComplete],0 ; Label completion enabled? jne get_char_2 - push di...

...getint diff -u syslinux-2.11/pxelinux.asm syslinux-2.11.new/pxelinux.asm --- syslinux-2.11/pxelinux.asm 2004-08-04 00:16:53.000000000 -0600 +++ syslinux-2.11.new/pxelinux.asm 2004-10-04 17:33:56.000000000 -0600 @@ -304,6 +304,7 @@ command_line resb max_cmd_len+2 ; Command line buffer alignb 4 default_cmd resb max_cmd_len+1 ; "default" command line +CpuIs64 resw 1 ; Is this cpu a x86_64 machine? ; ; PXE packets which don't need static initialization @@ -392,6 +393,27 @@ call writestr ; +; ID the CPU: Shamelessly borrowed from the Linux kernel arch/x86_64/kernel/head.S +; +...

Hi, I just replaced the pxelinux.0 of some 2.x version by pxelinux.0 vers. 3.0.7. Some of the PXE Clients refused to boot thereafter (just stopped after reading the config file). I noticed that the APPEND line was too long. Is this intentional? What is the maximum length of the APPEND option line? Thanks, Thomas

...pt + ; DTM END -------------------------------------------------- + pop di ; Command line write pointer push di mov byte [di],0 ; Null-terminate command line mov si,command_line call cwritestr ; Write command line so far pop di jmp short get_char_2 auto_boot: mov si,default_cmd mov di,command_line @@ -3377,21 +3435,24 @@ pushad .top: lodsb and al,al jz .end call writechr jmp short .top .end: popad popfd ret -%ifdef debug +; BEGIN DTM ------------------------------------------------ +;%if...

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

...extern uint16_t PXERetry; static struct labeldata ld; static int parse_main_config(const char *filename); +static int parse_bls1_dir(const char *dirname); static char *is_kernel_type(char *cmdstr, enum kernel_type *type) { @@ -1239,6 +1252,40 @@ static void parse_config_file(FILE * f) default_cmd = refstrdup(skipspace(p + 2)); } + else if (looking_at(p, "bls1")) { + p = skipspace(p + 4); + if (looking_at(p, "include")) { + p = skipspace(p + 7); + parse_bls1_dir((*p) ? p : BLS1_DIR); + } else if (looking_at(p, "labelf")) { + p = skipspace(p +...

...+ struct cli_command *comm_counter = NULL; if (!width) { int height; diff --git a/com32/elflink/ldlinux/config.h b/com32/elflink/ldlinux/config.h index c34b2cc..cab4c70 100644 --- a/com32/elflink/ldlinux/config.h +++ b/com32/elflink/ldlinux/config.h @@ -37,7 +37,11 @@ extern const char *default_cmd; //"default" command line extern const char *onerror; //"onerror" command line extern void cat_help_file(int key); +extern struct menu_entry *find_label(const char *str); +extern void print_labels(const char *prefix, size_t len); extern void eprintf(const char *filename,...