syslinux: fix shortcut caret appearing in menu entries

also fixes the mistaken assignment of the same shortcut for both
entries in live.cfg.in

Gbp-Dch: Short
This commit is contained in:
jnqnfe 2015-01-15 04:32:39 +00:00 committed by Lyndon Brown
parent 2fc60a1151
commit 0cef87ffca
20 changed files with 40 additions and 4 deletions

View File

@ -1,7 +1,9 @@
label hdt
menu label ^Hardware Detection Tool (HDT)
menu title Hardware Detection Tool (HDT)
com32 hdt.c32
label memtest
menu label ^Memory Diagnostic Tool (memtest86+)
menu title Memory Diagnostic Tool (memtest86+)
linux /live/memtest

View File

@ -1,11 +1,13 @@
label installgui
menu label ^Graphical install
menu title Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
label install
menu label ^Install
menu title Install
linux /install/vmlinuz
initrd /install/initrd.gz
append vga=788 @APPEND_INSTALL@ --- quiet

View File

@ -1,5 +1,6 @@
label install
menu label ^Install
menu title Install
linux /install/vmlinuz
initrd /install/initrd.gz
append vga=788 @APPEND_INSTALL@ --- quiet

View File

@ -1,5 +1,6 @@
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu title Live (@FLAVOUR@)
menu default
linux @LINUX@
initrd @INITRD@
@ -7,6 +8,7 @@ label live-@FLAVOUR@
label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
menu title Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@

View File

@ -6,10 +6,12 @@ include stdmenu.cfg
include live.cfg
include install.cfg
menu begin advanced
menu title ^Advanced options
menu label ^Advanced options
menu title Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu title Back..
menu exit
include advanced.cfg
menu end

View File

@ -1,7 +1,9 @@
label hdt
menu label ^Hardware Detection Tool (HDT)
menu title Hardware Detection Tool (HDT)
com32 hdt.c32
label memtest
menu label ^Memory Diagnostic Tool (memtest86+)
menu title Memory Diagnostic Tool (memtest86+)
linux /live/memtest

View File

@ -1,11 +1,13 @@
label installgui
menu label ^Graphical install
menu title Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
label install
menu label ^Install
menu title Install
linux /install/vmlinuz
initrd /install/initrd.gz
append vga=788 @APPEND_INSTALL@ --- quiet

View File

@ -1,5 +1,6 @@
label install
menu label ^Install
menu title Install
linux /install/vmlinuz
initrd /install/initrd.gz
append vga=788 @APPEND_INSTALL@ --- quiet

View File

@ -1,5 +1,6 @@
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu title Live (@FLAVOUR@)
menu default
linux @LINUX@
initrd @INITRD@
@ -7,6 +8,7 @@ label live-@FLAVOUR@
label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
menu title Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@

View File

@ -6,10 +6,12 @@ include stdmenu.cfg
include live.cfg
include install.cfg
menu begin advanced
menu title ^Advanced options
menu label ^Advanced options
menu title Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu title Back..
menu exit
include advanced.cfg
menu end

View File

@ -1,7 +1,9 @@
label hdt
menu label ^Hardware Detection Tool (HDT)
menu title Hardware Detection Tool (HDT)
com32 hdt.c32
label memtest
menu label ^Memory Diagnostic Tool (memtest86+)
menu title Memory Diagnostic Tool (memtest86+)
linux /live/memtest

View File

@ -1,11 +1,13 @@
label installgui
menu label ^Graphical install
menu title Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
label install
menu label ^Install
menu title Install
linux /install/vmlinuz
initrd /install/initrd.gz
append vga=788 @APPEND_INSTALL@ --- quiet

View File

@ -1,5 +1,6 @@
label install
menu label ^Install
menu title Install
linux /install/vmlinuz
initrd /install/initrd.gz
append vga=788 @APPEND_INSTALL@ --- quiet

View File

@ -1,5 +1,6 @@
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu title Live (@FLAVOUR@)
menu default
linux @LINUX@
initrd @INITRD@
@ -7,6 +8,7 @@ label live-@FLAVOUR@
label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
menu title Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@

View File

@ -6,10 +6,12 @@ include stdmenu.cfg
include live.cfg
include install.cfg
menu begin advanced
menu title ^Advanced options
menu label ^Advanced options
menu title Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu title Back..
menu exit
include advanced.cfg
menu end

View File

@ -1,7 +1,9 @@
label hdt
menu label ^Hardware Detection Tool (HDT)
menu title Hardware Detection Tool (HDT)
com32 hdt.c32
label memtest
menu label ^Memory Diagnostic Tool (memtest86+)
menu title Memory Diagnostic Tool (memtest86+)
linux /live/memtest

View File

@ -1,11 +1,13 @@
label installgui
menu label ^Graphical install
menu title Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
label install
menu label ^Install
menu title Install
linux /install/vmlinuz
initrd /install/initrd.gz
append vga=788 @APPEND_INSTALL@ --- quiet

View File

@ -1,5 +1,6 @@
label install
menu label ^Install
menu title Install
linux /install/vmlinuz
initrd /install/initrd.gz
append vga=788 @APPEND_INSTALL@ --- quiet

View File

@ -1,5 +1,6 @@
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu title Live (@FLAVOUR@)
menu default
linux @LINUX@
initrd @INITRD@
@ -7,6 +8,7 @@ label live-@FLAVOUR@
label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
menu title Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@

View File

@ -6,10 +6,12 @@ include stdmenu.cfg
include live.cfg
include install.cfg
menu begin advanced
menu title ^Advanced options
menu label ^Advanced options
menu title Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu title Back..
menu exit
include advanced.cfg
menu end