diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-01-06 11:28:24 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-01-06 11:30:22 -0800 |
| commit | b5ff778263ba1d815e5c4088b16dec33190c2c55 (patch) | |
| tree | df24db962861f438ea181f807cd79596f2609859 /core | |
| parent | 9c8b462f1fbcc0efd975bd1404c022fff56858d5 (diff) | |
| download | syslinux-b5ff778263ba1d815e5c4088b16dec33190c2c55.tar.gz | |
core: Remove the built-in default
The built-in default is rarely if ever used anymore and highly
confusing to users. Remove it entirely.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/configinit.inc | 9 | ||||
| -rw-r--r-- | core/ui.inc | 15 |
2 files changed, 15 insertions, 9 deletions
diff --git a/core/configinit.inc b/core/configinit.inc index cf6a814c..2795b2d1 100644 --- a/core/configinit.inc +++ b/core/configinit.inc @@ -37,11 +37,6 @@ reset_config: %endif %endif - mov si,linuxauto_cmd ; Default command: "linux auto" - mov di,default_cmd - mov cx,linuxauto_len - rep movsb - mov di,KbdMap ; Default keymap 1:1 xor al,al inc ch ; CX <- 256 @@ -53,7 +48,3 @@ mkkeymap: stosb mov [VKernelEnd],eax ret - - section .data -linuxauto_cmd db 'linux auto',0 -linuxauto_len equ $-linuxauto_cmd diff --git a/core/ui.inc b/core/ui.inc index 1b40717a..22258fcc 100644 --- a/core/ui.inc +++ b/core/ui.inc @@ -292,12 +292,27 @@ show_network_info: ; Jump here to run the default command line ; auto_boot: + cmp word [DefaultLevel],0 ; No UI or DEFAULT? + jne .have_default + mov si,no_default_msg + call writestr + cmp word [NoEscape],0 ; NOESCAPE but no DEFAULT? + jne kaboom ; If so, we're stuck! + jmp enter_command + +.have_default: mov si,default_cmd mov di,command_line mov cx,(max_cmd_len+4) >> 2 rep movsd jmp short load_kernel + section .data +no_default_msg db 'No DEFAULT or UI configuration directive found!' + db CR, LF, 0 + + section .text + ; ; Jump here when the command line is completed ; |