diff options
| author | hpa <hpa> | 2003-11-26 00:14:59 +0000 |
|---|---|---|
| committer | hpa <hpa> | 2003-11-26 00:14:59 +0000 |
| commit | 66b18fd20b78187c9172be803954e1140932c7cb (patch) | |
| tree | 4d4c75fac3008090dc4ecaae931216e953443560 | |
| parent | bfae00f12b0ec32d6826f171ff5811d3066a7632 (diff) | |
| download | syslinux-66b18fd20b78187c9172be803954e1140932c7cb.tar.gz | |
Rename timeoutcmd -> ontimeout
| -rw-r--r-- | isolinux.asm | 4 | ||||
| -rw-r--r-- | keywords | 2 | ||||
| -rw-r--r-- | keywords.inc | 2 | ||||
| -rw-r--r-- | ldlinux.asm | 4 | ||||
| -rw-r--r-- | parseconfig.inc | 8 | ||||
| -rw-r--r-- | pxelinux.asm | 4 | ||||
| -rw-r--r-- | syslinux.doc | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/isolinux.asm b/isolinux.asm index e8e98064..ad1c3240 100644 --- a/isolinux.asm +++ b/isolinux.asm @@ -133,7 +133,7 @@ dir_clust resd 1 ; Length in clusters VKernelBuf: resb vk_size ; "Current" vkernel alignb 4 AppendBuf resb max_cmd_len+1 ; append= -TimeOutCmd resb max_cmd_len+1 ; timeoutcmd +Ontimeout resb max_cmd_len+1 ; ontimeout KbdMap resb 256 ; Keyboard map FKeyName resb 10*FILENAME_MAX ; File names for F-key help NumBuf resb 15 ; Buffer to load number @@ -1609,7 +1609,7 @@ img_table: ; Misc initialized (data) variables ; AppendLen dw 0 ; Bytes in append= command -TimeOutCmdLen dw 0 ; Bytes in timeoutcmd command +OntimeoutLen dw 0 ; Bytes in ontimeout command KbdTimeOut dw 0 ; Keyboard timeout (if any) CmdLinePtr dw cmd_line_here ; Command line advancing pointer initrd_flag equ $ @@ -13,7 +13,7 @@ prompt say serial timeout -timeoutcmd +ontimeout f0 f1 f2 diff --git a/keywords.inc b/keywords.inc index b7c18ebc..2fcae3b6 100644 --- a/keywords.inc +++ b/keywords.inc @@ -57,7 +57,7 @@ keywd_table: keyword say, pc_say keyword serial, pc_serial keyword timeout, pc_timeout - keyword timeoutcmd, pc_timeoutcmd + keyword ontimeout, pc_ontimeout keyword f1, pc_fkey, FKeyName+(0<<FILENAME_MAX_LG2) keyword f2, pc_fkey, FKeyName+(1<<FILENAME_MAX_LG2) keyword f3, pc_fkey, FKeyName+(2<<FILENAME_MAX_LG2) diff --git a/ldlinux.asm b/ldlinux.asm index 251b0f1d..9bbaab9f 100644 --- a/ldlinux.asm +++ b/ldlinux.asm @@ -123,7 +123,7 @@ xbs_vgatmpbuf equ 2*trackbufsize VKernelBuf: resb vk_size ; "Current" vkernel alignb 4 AppendBuf resb max_cmd_len+1 ; append= -TimeOutCmd resb max_cmd_len+1 ; timeoutcmd +Ontimeout resb max_cmd_len+1 ; ontimeout KbdMap resb 256 ; Keyboard map FKeyName resb 10*16 ; File names for F-key help NumBuf resb 15 ; Buffer to load number @@ -1431,7 +1431,7 @@ exten_table_end: debug_magic dw 0D00Dh ; Debug code sentinel %endif AppendLen dw 0 ; Bytes in append= command -TimeOutCmdLen dw 0 ; Bytes in timeoutcmd command +OntimeoutLen dw 0 ; Bytes in ontimeout command KbdTimeOut dw 0 ; Keyboard timeout (if any) CmdLinePtr dw cmd_line_here ; Command line advancing pointer initrd_flag equ $ diff --git a/parseconfig.inc b/parseconfig.inc index 937d22f2..34842d85 100644 --- a/parseconfig.inc +++ b/parseconfig.inc @@ -27,12 +27,12 @@ pc_default: mov di,default_cmd ret ; -; "timeoutcmd" command +; "ontimeout" command ; -pc_timeoutcmd: mov di,TimeOutCmd +pc_ontimeout: mov di,Ontimeout call getline - sub di,TimeOutCmd - mov [TimeOutCmdLen],di + sub di,Ontimeout + mov [OntimeoutLen],di ret ; diff --git a/pxelinux.asm b/pxelinux.asm index 1a2f4889..ca07cf66 100644 --- a/pxelinux.asm +++ b/pxelinux.asm @@ -205,7 +205,7 @@ xbs_vgatmpbuf equ 2*trackbufsize VKernelBuf: resb vk_size ; "Current" vkernel alignb 4 AppendBuf resb max_cmd_len+1 ; append= -TimeOutCmd resb max_cmd_len+1 ; timeoutcmd +Ontimeout resb max_cmd_len+1 ; ontimeout KbdMap resb 256 ; Keyboard map BootFile resb 256 ; Boot file from DHCP packet PathPrefix resb 256 ; Path prefix derived from the above @@ -2507,7 +2507,7 @@ pxe_udp_read_pkt: BaseStack dd StackBuf ; SS:ESP of base stack dw 0 AppendLen dw 0 ; Bytes in append= command -TimeOutCmdLen dw 0 ; Bytes in timeoutcmd command +OntimeoutLen dw 0 ; Bytes in ontimeout command KbdTimeOut dw 0 ; Keyboard timeout (if any) CmdLinePtr dw cmd_line_here ; Command line advancing pointer initrd_flag equ $ diff --git a/syslinux.doc b/syslinux.doc index 765924d0..2cf01013 100644 --- a/syslinux.doc +++ b/syslinux.doc @@ -222,7 +222,7 @@ TIMEOUT timeout NOTE: The maximum possible timeout value is 35996; corresponding to just below one hour. -TIMEOUTCMD kernel options... +ONTIMEOUT kernel options... Sets the command line invoked on a timeout. Normally this is the same thing as invoked by "DEFAULT". If this is specified, then "DEFAULT" is used only if the user presses <Enter> to |