diff options
| author | hpa <hpa> | 2001-03-28 21:25:07 +0000 |
|---|---|---|
| committer | hpa <hpa> | 2001-03-28 21:25:07 +0000 |
| commit | 19edf5c5bcf2e031f604c89e4d48b72b7bad4f37 (patch) | |
| tree | 6398c12351f232337f2ed7a9a9bdf3b7c97e548d | |
| parent | 0f6347df2e9243ab294fcbfbf9b44f016ecfd2a6 (diff) | |
| download | syslinux-1.54-pre3.tar.gz | |
Get rid of the automatic appending of "auto".syslinux-1.54-pre3
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ldlinux.asm | 9 | ||||
| -rw-r--r-- | pxelinux.asm | 9 | ||||
| -rw-r--r-- | syslinux.doc | 12 |
4 files changed, 17 insertions, 16 deletions
@@ -10,6 +10,9 @@ Changes in 1.54: stupid mode ("syslinux -s"). * PXELINUX: Document further some of the pathologies with old PXE stacks. + * When specifying a "default" command line, no longer + automatically appent "auto". See the "DEFAULT" command in + syslinux.doc for more information. Changes in 1.53: * PXELINUX: Rename pxelinux.bin to pxelinux.0, to match what diff --git a/ldlinux.asm b/ldlinux.asm index 39301e7f..e701b38b 100644 --- a/ldlinux.asm +++ b/ldlinux.asm @@ -1187,9 +1187,8 @@ parse_config: pc_default: mov di,default_cmd ; "default" command call getline - mov si,auto_cmd ; add "auto"+null - mov cx,auto_len - rep movsb + xor al,al + stosb ; null-terminate jmp short parse_config pc_append: cmp word [VKernelCtr],byte 0 ; "append" command @@ -3809,10 +3808,8 @@ A20Type dw A20_DUNNO ; A20 type unknown ; Stuff for the command line; we do some trickery here with equ to avoid ; tons of zeros appended to our file and wasting space ; -linuxauto_cmd db 'linux ' -auto_cmd db 'auto',0 +linuxauto_cmd db 'linux auto',0 linuxauto_len equ $-linuxauto_cmd -auto_len equ $-auto_cmd boot_image db 'BOOT_IMAGE=' boot_image_len equ $-boot_image align 4, db 0 ; For the good of REP MOVSD diff --git a/pxelinux.asm b/pxelinux.asm index 6a937544..726af0bb 100644 --- a/pxelinux.asm +++ b/pxelinux.asm @@ -864,9 +864,8 @@ parse_config: pc_default: mov di,default_cmd ; "default" command call getline - mov si,auto_cmd ; add "auto"+null - mov cx,auto_len - rep movsb + xor al,al + stosb ; null-terminate jmp short parse_config pc_append: cmp word [VKernelCtr],byte 0 ; "append" command @@ -4335,10 +4334,8 @@ IPAppend db 0 ; Default IPAPPEND option ; Stuff for the command line; we do some trickery here with equ to avoid ; tons of zeros appended to our file and wasting space ; -linuxauto_cmd db 'linux ' -auto_cmd db 'auto',0 +linuxauto_cmd db 'linux auto',0 linuxauto_len equ $-linuxauto_cmd -auto_len equ $-auto_cmd boot_image db 'BOOT_IMAGE=' boot_image_len equ $-boot_image align 4, db 0 ; For the good of REP MOVSD diff --git a/syslinux.doc b/syslinux.doc index c76bceca..a886f082 100644 --- a/syslinux.doc +++ b/syslinux.doc @@ -98,12 +98,16 @@ PXELINUX. DEFAULT kernel options... Sets the default command line. If SYSLINUX boots automatically, it will act just as if the entries after DEFAULT had been typed - in at the "boot:" prompt, except that the option "auto" is - automatically added, indicating an automatic boot. + in at the "boot:" prompt. If no configuration file is present, or no DEFAULT entry is - present in the config file, the default is kernel name "linux", - with no options. + present in the config file, the default is "linux auto". + + NOTE: Earlier versions of SYSLINUX used to automatically + append the string "auto" to whatever the user specified using + the DEFAULT command. As of version 1.54, this is no longer + true, as it caused problems when using a shell as a substitute + for "init." You may want to include this option manually. APPEND options... Add one or more options to the kernel command line. These are |