aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhpa <hpa>2004-12-21 23:01:43 +0000
committerhpa <hpa>2004-12-21 23:01:43 +0000
commitc81c57367f2abbb1003de78990ead873c857193d (patch)
tree45a03870d7021ad8e97a07a79e87f54bc485cd7a
parent8db502c28e8d3d076c834762b95c62ec501574fc (diff)
downloadsyslinux-c81c57367f2abbb1003de78990ead873c857193d.tar.gz
syslinux-c81c57367f2abbb1003de78990ead873c857193d.tar.xz
syslinux-c81c57367f2abbb1003de78990ead873c857193d.zip
Add NOESCAPE command to disable Shift key; update NEWS.
-rw-r--r--NEWS4
-rw-r--r--keywords1
-rw-r--r--keywords.inc1
-rw-r--r--parseconfig.inc7
-rw-r--r--syslinux.doc5
5 files changed, 18 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 0e22cb54..1a8f0bdf 100644
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,10 @@ Changes in 2.20:
boot sector to a file instead of the real boot sector. This
is currently not supported in any of the other installers,
but should be added to the Win32 installer at some point.
+ * ALL: New NOESCAPE command, disables the "hold down the Shift
+ key to display the prompt" behaviour.
+ * New simple menu system, as an alternative to the advanced
+ menu system already present. See README.menu for details.
Changes in 2.13:
* MEMDISK: Fix command-line parsing "brown paper bag" class
diff --git a/keywords b/keywords
index 2f0ae4f5..046a2f29 100644
--- a/keywords
+++ b/keywords
@@ -17,6 +17,7 @@ timeout
allowoptions
ontimeout
onerror
+noescape
f0
f1
f2
diff --git a/keywords.inc b/keywords.inc
index 5fa547d8..a4b665e1 100644
--- a/keywords.inc
+++ b/keywords.inc
@@ -61,6 +61,7 @@ keywd_table:
keyword ontimeout, pc_ontimeout
keyword onerror, pc_onerror
keyword allowoptions, pc_setint16, AllowOptions
+ keyword noescape, pc_noescape
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/parseconfig.inc b/parseconfig.inc
index 6d7c93e9..c72a5692 100644
--- a/parseconfig.inc
+++ b/parseconfig.inc
@@ -270,6 +270,13 @@ pc_say: call pc_getline ; "say" command
jmp crlf ; tailcall
;
+; "noescape" command
+;
+pc_noescape:
+ mov byte [KbdFlags],0
+ ; Fall into pc_getline
+
+;
; Comment line
;
pc_comment: ; Fall into pc_getline
diff --git a/syslinux.doc b/syslinux.doc
index 898843eb..5e00646f 100644
--- a/syslinux.doc
+++ b/syslinux.doc
@@ -324,6 +324,11 @@ PROMPT flag_val
key is pressed, or Caps Lock or Scroll lock is set (this is the
default). If flag_val is 1, always display the boot: prompt.
+NOESCAPE flag_val
+ If flag_val is set to 1, ignore the Shift/Alt/Caps Lock/Scroll
+ Lock escapes. Use this (together with PROMPT 0) to force the
+ default boot alternative.
+
F1 filename
F2 filename
...etc...