syslinux: properly fix shortcut caret appearing in menu entries

this reverts commit 0cef87ffca0e9d89ac1f8e0098f890f2eefd3559 though
retaining the 'advanced options' menu entry using a label rather than a
title.

despite having done a lot of testing back in 2015 with my bootloader
improvements, i notice now that in fact the syslinux caret fix has an
undesired side effect of modifying the title displayed above the menus. it
does not help that the text embedded into the splash overlaps with this
menu title; perhaps this explains why i missed this problem back in 2015.

purely reverting the implemented fix solves this title problem, but
restores the caret problem to the advanced options menu (in menu.cfg);
however that menu was using a caret in a title entry, unlike everywhere
else where they are only used with labels, which must have been the
original source of the problem all along. ensuring that this menu uses a
label instead of a title in this reversion leaves everything working
correctly afaict.

Gbp-Dch: Ignore

24 files changed, 0 insertions, 83 deletions

diff --git a/share/bootloaders/extlinux/advanced.cfg b/share/bootloaders/extlinux/advanced.cfg
index 11d733332..dca5f1ca4 100644
--- a/share/bootloaders/extlinux/advanced.cfg
+++ b/share/bootloaders/extlinux/advanced.cfg
@@ -1,6 +1,5 @@
 label hdt
 	menu label ^Hardware Detection Tool (HDT)
-	menu title Hardware Detection Tool (HDT)
 	com32 hdt.c32
 
 @OPTIONAL_MEMTEST_INCLUDE@
diff --git a/share/bootloaders/extlinux/install_gui.cfg b/share/bootloaders/extlinux/install_gui.cfg
index 9c660200a..1c98beef9 100644
--- a/share/bootloaders/extlinux/install_gui.cfg
+++ b/share/bootloaders/extlinux/install_gui.cfg
@@ -1,52 +1,43 @@
 menu begin install
 	menu label ^Install options
-	menu title Install options
 	include stdmenu.cfg
 	label mainmenu
 		menu label ^Back..
-		menu title Back..
 		menu exit
 
 	label installgui
 		menu label ^Graphical install
-		menu title Graphical install
 		linux /install/gtk/vmlinuz
 		initrd /install/gtk/initrd.gz
 		append 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
 
 	menu begin advinstall
 		menu label ^Advanced install options
-		menu title Advanced install options
 		include stdmenu.cfg
 		label mainmenu
 			menu label ^Back..
-			menu title Back..
 			menu exit
 
 		label expertgui
 			menu label Graphical ^expert install
-			menu title Graphical expert install
 			linux /install/gtk/vmlinuz
 			initrd /install/gtk/initrd.gz
 			append priority=low vga=788 @APPEND_INSTALL@
 
 		label rescuegui
 			menu label Graphical ^rescue mode
-			menu title Graphical rescue mode
 			linux /install/gtk/vmlinuz
 			initrd /install/gtk/initrd.gz
 			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
 
 		label autogui
 			menu label Graphical ^automated install
-			menu title Graphical automated install
 			linux /install/gtk/vmlinuz
 			initrd /install/gtk/initrd.gz
 			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
@@ -72,7 +63,6 @@ menu begin install
 
 	label installspeechsynth
 		menu label Graphical install with ^speech synthesis
-		menu title Graphical install with speech synthesis
 		linux /install/gtk/vmlinuz
 		initrd /install/gtk/initrd.gz
 		append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/extlinux/install_text.cfg b/share/bootloaders/extlinux/install_text.cfg
index 4320287e3..197d647e7 100644
--- a/share/bootloaders/extlinux/install_text.cfg
+++ b/share/bootloaders/extlinux/install_text.cfg
@@ -1,26 +1,21 @@
 menu begin install
 	menu label ^Install options
-	menu title Install options
 	include stdmenu.cfg
 	label mainmenu
 		menu label ^Back..
-		menu title Back..
 		menu exit
 
 	label install
 		menu label ^Install
-		menu title Install
 		linux /install/vmlinuz
 		initrd /install/initrd.gz
 		append vga=788 @APPEND_INSTALL@ --- quiet
 
 	menu begin advinstall
 		menu label ^Advanced install options
-		menu title Advanced install options
 		include stdmenu.cfg
 		label mainmenu
 			menu label ^Back..
-			menu title ^Back..
 			menu exit
 
 		label expert
diff --git a/share/bootloaders/extlinux/live.cfg.in b/share/bootloaders/extlinux/live.cfg.in
index efeb2607d..a405349a2 100644
--- a/share/bootloaders/extlinux/live.cfg.in
+++ b/share/bootloaders/extlinux/live.cfg.in
@@ -1,6 +1,5 @@
 label live-@FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
-	menu title Live (@FLAVOUR@)
 	menu default
 	linux @LINUX@
 	initrd @INITRD@
diff --git a/share/bootloaders/extlinux/memtest.cfg b/share/bootloaders/extlinux/memtest.cfg
index 99f4c33b1..da8b8a45a 100644
--- a/share/bootloaders/extlinux/memtest.cfg
+++ b/share/bootloaders/extlinux/memtest.cfg
@@ -1,4 +1,3 @@
 label memtest
 	menu label ^Memory Diagnostic Tool (@MEMTEST_VERSION@)
-	menu title Memory Diagnostic Tool (@MEMTEST_VERSION@)
 	linux @MEMTEST@
diff --git a/share/bootloaders/extlinux/menu.cfg b/share/bootloaders/extlinux/menu.cfg
index b70ef5a2a..69977c825 100644
--- a/share/bootloaders/extlinux/menu.cfg
+++ b/share/bootloaders/extlinux/menu.cfg
@@ -7,11 +7,9 @@ include live.cfg
 @OPTIONAL_INSTALLER_INCLUDE@
 menu begin advanced
 	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
diff --git a/share/bootloaders/isolinux/advanced.cfg b/share/bootloaders/isolinux/advanced.cfg
index 11d733332..dca5f1ca4 100644
--- a/share/bootloaders/isolinux/advanced.cfg
+++ b/share/bootloaders/isolinux/advanced.cfg
@@ -1,6 +1,5 @@
 label hdt
 	menu label ^Hardware Detection Tool (HDT)
-	menu title Hardware Detection Tool (HDT)
 	com32 hdt.c32
 
 @OPTIONAL_MEMTEST_INCLUDE@
diff --git a/share/bootloaders/isolinux/install_gui.cfg b/share/bootloaders/isolinux/install_gui.cfg
index 9c660200a..1c98beef9 100644
--- a/share/bootloaders/isolinux/install_gui.cfg
+++ b/share/bootloaders/isolinux/install_gui.cfg
@@ -1,52 +1,43 @@
 menu begin install
 	menu label ^Install options
-	menu title Install options
 	include stdmenu.cfg
 	label mainmenu
 		menu label ^Back..
-		menu title Back..
 		menu exit
 
 	label installgui
 		menu label ^Graphical install
-		menu title Graphical install
 		linux /install/gtk/vmlinuz
 		initrd /install/gtk/initrd.gz
 		append 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
 
 	menu begin advinstall
 		menu label ^Advanced install options
-		menu title Advanced install options
 		include stdmenu.cfg
 		label mainmenu
 			menu label ^Back..
-			menu title Back..
 			menu exit
 
 		label expertgui
 			menu label Graphical ^expert install
-			menu title Graphical expert install
 			linux /install/gtk/vmlinuz
 			initrd /install/gtk/initrd.gz
 			append priority=low vga=788 @APPEND_INSTALL@
 
 		label rescuegui
 			menu label Graphical ^rescue mode
-			menu title Graphical rescue mode
 			linux /install/gtk/vmlinuz
 			initrd /install/gtk/initrd.gz
 			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
 
 		label autogui
 			menu label Graphical ^automated install
-			menu title Graphical automated install
 			linux /install/gtk/vmlinuz
 			initrd /install/gtk/initrd.gz
 			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
@@ -72,7 +63,6 @@ menu begin install
 
 	label installspeechsynth
 		menu label Graphical install with ^speech synthesis
-		menu title Graphical install with speech synthesis
 		linux /install/gtk/vmlinuz
 		initrd /install/gtk/initrd.gz
 		append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/isolinux/install_text.cfg b/share/bootloaders/isolinux/install_text.cfg
index 6f0e17427..197d647e7 100644
--- a/share/bootloaders/isolinux/install_text.cfg
+++ b/share/bootloaders/isolinux/install_text.cfg
@@ -1,26 +1,21 @@
 menu begin install
 	menu label ^Install options
-	menu title Install options
 	include stdmenu.cfg
 	label mainmenu
 		menu label ^Back..
-		menu title Back..
 		menu exit
 
 	label install
 		menu label ^Install
-		menu title Install
 		linux /install/vmlinuz
 		initrd /install/initrd.gz
 		append vga=788 @APPEND_INSTALL@ --- quiet
 
 	menu begin advinstall
 		menu label ^Advanced install options
-		menu title Advanced install options
 		include stdmenu.cfg
 		label mainmenu
 			menu label ^Back..
-			menu title Back..
 			menu exit
 
 		label expert
diff --git a/share/bootloaders/isolinux/live.cfg.in b/share/bootloaders/isolinux/live.cfg.in
index efeb2607d..a405349a2 100644
--- a/share/bootloaders/isolinux/live.cfg.in
+++ b/share/bootloaders/isolinux/live.cfg.in
@@ -1,6 +1,5 @@
 label live-@FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
-	menu title Live (@FLAVOUR@)
 	menu default
 	linux @LINUX@
 	initrd @INITRD@
diff --git a/share/bootloaders/isolinux/memtest.cfg b/share/bootloaders/isolinux/memtest.cfg
index 99f4c33b1..da8b8a45a 100644
--- a/share/bootloaders/isolinux/memtest.cfg
+++ b/share/bootloaders/isolinux/memtest.cfg
@@ -1,4 +1,3 @@
 label memtest
 	menu label ^Memory Diagnostic Tool (@MEMTEST_VERSION@)
-	menu title Memory Diagnostic Tool (@MEMTEST_VERSION@)
 	linux @MEMTEST@
diff --git a/share/bootloaders/isolinux/menu.cfg b/share/bootloaders/isolinux/menu.cfg
index b70ef5a2a..69977c825 100644
--- a/share/bootloaders/isolinux/menu.cfg
+++ b/share/bootloaders/isolinux/menu.cfg
@@ -7,11 +7,9 @@ include live.cfg
 @OPTIONAL_INSTALLER_INCLUDE@
 menu begin advanced
 	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
diff --git a/share/bootloaders/pxelinux/advanced.cfg b/share/bootloaders/pxelinux/advanced.cfg
index 11d733332..dca5f1ca4 100644
--- a/share/bootloaders/pxelinux/advanced.cfg
+++ b/share/bootloaders/pxelinux/advanced.cfg
@@ -1,6 +1,5 @@
 label hdt
 	menu label ^Hardware Detection Tool (HDT)
-	menu title Hardware Detection Tool (HDT)
 	com32 hdt.c32
 
 @OPTIONAL_MEMTEST_INCLUDE@
diff --git a/share/bootloaders/pxelinux/install_gui.cfg b/share/bootloaders/pxelinux/install_gui.cfg
index 9c660200a..1c98beef9 100644
--- a/share/bootloaders/pxelinux/install_gui.cfg
+++ b/share/bootloaders/pxelinux/install_gui.cfg
@@ -1,52 +1,43 @@
 menu begin install
 	menu label ^Install options
-	menu title Install options
 	include stdmenu.cfg
 	label mainmenu
 		menu label ^Back..
-		menu title Back..
 		menu exit
 
 	label installgui
 		menu label ^Graphical install
-		menu title Graphical install
 		linux /install/gtk/vmlinuz
 		initrd /install/gtk/initrd.gz
 		append 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
 
 	menu begin advinstall
 		menu label ^Advanced install options
-		menu title Advanced install options
 		include stdmenu.cfg
 		label mainmenu
 			menu label ^Back..
-			menu title Back..
 			menu exit
 
 		label expertgui
 			menu label Graphical ^expert install
-			menu title Graphical expert install
 			linux /install/gtk/vmlinuz
 			initrd /install/gtk/initrd.gz
 			append priority=low vga=788 @APPEND_INSTALL@
 
 		label rescuegui
 			menu label Graphical ^rescue mode
-			menu title Graphical rescue mode
 			linux /install/gtk/vmlinuz
 			initrd /install/gtk/initrd.gz
 			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
 
 		label autogui
 			menu label Graphical ^automated install
-			menu title Graphical automated install
 			linux /install/gtk/vmlinuz
 			initrd /install/gtk/initrd.gz
 			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
@@ -72,7 +63,6 @@ menu begin install
 
 	label installspeechsynth
 		menu label Graphical install with ^speech synthesis
-		menu title Graphical install with speech synthesis
 		linux /install/gtk/vmlinuz
 		initrd /install/gtk/initrd.gz
 		append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/pxelinux/install_text.cfg b/share/bootloaders/pxelinux/install_text.cfg
index 6f0e17427..197d647e7 100644
--- a/share/bootloaders/pxelinux/install_text.cfg
+++ b/share/bootloaders/pxelinux/install_text.cfg
@@ -1,26 +1,21 @@
 menu begin install
 	menu label ^Install options
-	menu title Install options
 	include stdmenu.cfg
 	label mainmenu
 		menu label ^Back..
-		menu title Back..
 		menu exit
 
 	label install
 		menu label ^Install
-		menu title Install
 		linux /install/vmlinuz
 		initrd /install/initrd.gz
 		append vga=788 @APPEND_INSTALL@ --- quiet
 
 	menu begin advinstall
 		menu label ^Advanced install options
-		menu title Advanced install options
 		include stdmenu.cfg
 		label mainmenu
 			menu label ^Back..
-			menu title Back..
 			menu exit
 
 		label expert
diff --git a/share/bootloaders/pxelinux/live.cfg.in b/share/bootloaders/pxelinux/live.cfg.in
index efeb2607d..a405349a2 100644
--- a/share/bootloaders/pxelinux/live.cfg.in
+++ b/share/bootloaders/pxelinux/live.cfg.in
@@ -1,6 +1,5 @@
 label live-@FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
-	menu title Live (@FLAVOUR@)
 	menu default
 	linux @LINUX@
 	initrd @INITRD@
diff --git a/share/bootloaders/pxelinux/memtest.cfg b/share/bootloaders/pxelinux/memtest.cfg
index 99f4c33b1..da8b8a45a 100644
--- a/share/bootloaders/pxelinux/memtest.cfg
+++ b/share/bootloaders/pxelinux/memtest.cfg
@@ -1,4 +1,3 @@
 label memtest
 	menu label ^Memory Diagnostic Tool (@MEMTEST_VERSION@)
-	menu title Memory Diagnostic Tool (@MEMTEST_VERSION@)
 	linux @MEMTEST@
diff --git a/share/bootloaders/pxelinux/menu.cfg b/share/bootloaders/pxelinux/menu.cfg
index b70ef5a2a..69977c825 100644
--- a/share/bootloaders/pxelinux/menu.cfg
+++ b/share/bootloaders/pxelinux/menu.cfg
@@ -7,11 +7,9 @@ include live.cfg
 @OPTIONAL_INSTALLER_INCLUDE@
 menu begin advanced
 	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
diff --git a/share/bootloaders/syslinux/advanced.cfg b/share/bootloaders/syslinux/advanced.cfg
index 11d733332..dca5f1ca4 100644
--- a/share/bootloaders/syslinux/advanced.cfg
+++ b/share/bootloaders/syslinux/advanced.cfg
@@ -1,6 +1,5 @@
 label hdt
 	menu label ^Hardware Detection Tool (HDT)
-	menu title Hardware Detection Tool (HDT)
 	com32 hdt.c32
 
 @OPTIONAL_MEMTEST_INCLUDE@
diff --git a/share/bootloaders/syslinux/install_gui.cfg b/share/bootloaders/syslinux/install_gui.cfg
index 9c660200a..1c98beef9 100644
--- a/share/bootloaders/syslinux/install_gui.cfg
+++ b/share/bootloaders/syslinux/install_gui.cfg
@@ -1,52 +1,43 @@
 menu begin install
 	menu label ^Install options
-	menu title Install options
 	include stdmenu.cfg
 	label mainmenu
 		menu label ^Back..
-		menu title Back..
 		menu exit
 
 	label installgui
 		menu label ^Graphical install
-		menu title Graphical install
 		linux /install/gtk/vmlinuz
 		initrd /install/gtk/initrd.gz
 		append 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
 
 	menu begin advinstall
 		menu label ^Advanced install options
-		menu title Advanced install options
 		include stdmenu.cfg
 		label mainmenu
 			menu label ^Back..
-			menu title Back..
 			menu exit
 
 		label expertgui
 			menu label Graphical ^expert install
-			menu title Graphical expert install
 			linux /install/gtk/vmlinuz
 			initrd /install/gtk/initrd.gz
 			append priority=low vga=788 @APPEND_INSTALL@
 
 		label rescuegui
 			menu label Graphical ^rescue mode
-			menu title Graphical rescue mode
 			linux /install/gtk/vmlinuz
 			initrd /install/gtk/initrd.gz
 			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
 
 		label autogui
 			menu label Graphical ^automated install
-			menu title Graphical automated install
 			linux /install/gtk/vmlinuz
 			initrd /install/gtk/initrd.gz
 			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
@@ -72,7 +63,6 @@ menu begin install
 
 	label installspeechsynth
 		menu label Graphical install with ^speech synthesis
-		menu title Graphical install with speech synthesis
 		linux /install/gtk/vmlinuz
 		initrd /install/gtk/initrd.gz
 		append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/syslinux/install_text.cfg b/share/bootloaders/syslinux/install_text.cfg
index cf853e48b..a7c33e316 100644
--- a/share/bootloaders/syslinux/install_text.cfg
+++ b/share/bootloaders/syslinux/install_text.cfg
@@ -1,45 +1,37 @@
 menu begin install
 	menu label ^Install options
-	menu title Install options
 	include stdmenu.cfg
 	label mainmenu
 		menu label ^Back..
-		menu title Back..
 		menu exit
 
 	label install
 		menu label ^Install
-		menu title Install
 		linux /install/vmlinuz
 		initrd /install/initrd.gz
 		append vga=788 @APPEND_INSTALL@ --- quiet
 
 	menu begin advinstall
 		menu label ^Advanced install options
-		menu title Advanced install options
 		include stdmenu.cfg
 		label mainmenu
 			menu label ^Back..
-			menu title Back..
 			menu exit
 
 		label expert
 			menu label ^Expert install
-			menu title Expert install
 			linux /install/vmlinuz
 			initrd /install/initrd.gz
 			append priority=low vga=788 @APPEND_INSTALL@
 
 		label rescue
 			menu label ^Rescue mode
-			menu title Rescue mode
 			linux /install/vmlinuz
 			initrd /install/initrd.gz
 			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
 
 		label auto
 			menu label ^Automated install
-			menu title Automated install
 			linux /install/vmlinuz
 			initrd /install/initrd.gz
 			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/share/bootloaders/syslinux/live.cfg.in b/share/bootloaders/syslinux/live.cfg.in
index efeb2607d..a405349a2 100644
--- a/share/bootloaders/syslinux/live.cfg.in
+++ b/share/bootloaders/syslinux/live.cfg.in
@@ -1,6 +1,5 @@
 label live-@FLAVOUR@
 	menu label ^Live (@FLAVOUR@)
-	menu title Live (@FLAVOUR@)
 	menu default
 	linux @LINUX@
 	initrd @INITRD@
diff --git a/share/bootloaders/syslinux/memtest.cfg b/share/bootloaders/syslinux/memtest.cfg
index 99f4c33b1..da8b8a45a 100644
--- a/share/bootloaders/syslinux/memtest.cfg
+++ b/share/bootloaders/syslinux/memtest.cfg
@@ -1,4 +1,3 @@
 label memtest
 	menu label ^Memory Diagnostic Tool (@MEMTEST_VERSION@)
-	menu title Memory Diagnostic Tool (@MEMTEST_VERSION@)
 	linux @MEMTEST@
diff --git a/share/bootloaders/syslinux/menu.cfg b/share/bootloaders/syslinux/menu.cfg
index b70ef5a2a..69977c825 100644
--- a/share/bootloaders/syslinux/menu.cfg
+++ b/share/bootloaders/syslinux/menu.cfg
@@ -7,11 +7,9 @@ include live.cfg
 @OPTIONAL_INSTALLER_INCLUDE@
 menu begin advanced
 	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