bootloaders: reorganise installer menu entries

per layout from MR #199 discussion.

under "Advanced install options" we have:
  - Graphical installer
  - Text installer
  - Graphical installer with dark theme
  - Text installer with dark theme
  - Installer with speech synthesis

under each of these we have a set of:
  - Install
  - Expert install
  - Automated install
  - Rescue mode

note that the 'automated' entries are moved up before the 'rescue' entries.

for hotkeys, the four entries above have hotkeys of 'i', 'x', 'a', and 'r'
respectively. ('x' is used instead of 'e' to avoid clash with standard
grub hotkey). this means that some entries that previous had no hotkeys
due to the flat list now have them. the other big difference is the main
graphical install entry going from 'g' to 'i' for consistency and the main
speech synth entry going from 's' to 'i' for the same reason.

furthermore, in the level above we have 'g' for normal graphical, 't' for
normal text install, 's' for speech synth, 'd' for graphical dark mode,
and 'k' for text dark mode.

the text-only sets are identical to the graphical ones except only for
dropping the graphical groups, simplifying maintenance, bringing clarity
to users of images (who may not have even made the image) that the set is
text-only, and keeping consistent hotkeys between graphical and text-only.

a 'start installer with speech synthesis' entry shortcut has been placed
at the top menu level alongside the 'start installer' shortcut.

Gbp-Dch: Short

1 files changed, 39 insertions, 30 deletions

diff --git a/share/bootloaders/syslinux_common/install_text.cfg b/share/bootloaders/syslinux_common/install_text.cfg
index cf2e17cb5..1d16f8a11 100644
--- a/share/bootloaders/syslinux_common/install_text.cfg
+++ b/share/bootloaders/syslinux_common/install_text.cfg
@@ -1,4 +1,4 @@
-label installgui
+label installstart
 	menu label Start ^installer
 	linux @KERNEL_DI@
 	initrd @INITRD_DI@
@@ -12,33 +12,42 @@ menu begin install
 		menu label ^Back..
 		menu exit
 
-	label install
-		menu label ^Install
-		linux @KERNEL_DI@
-		initrd @INITRD_DI@
-		append vga=788 @APPEND_INSTALL@ --- quiet
+	menu begin textinstall
+		menu label ^Text installer
+		menu title Text installer
+		include stdmenu.cfg
+		label mainmenu
+			menu label ^Back..
+			menu exit
 
-	label expert
-		menu label E^xpert install
-		linux @KERNEL_DI@
-		initrd @INITRD_DI@
-		append priority=low vga=788 @APPEND_INSTALL@
+		label install
+			menu label ^Install
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append vga=788 @APPEND_INSTALL@ --- quiet
 
-	label rescue
-		menu label ^Rescue mode
-		linux @KERNEL_DI@
-		initrd @INITRD_DI@
-		append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+		label expert
+			menu label E^xpert install
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append priority=low vga=788 @APPEND_INSTALL@
 
-	label auto
-		menu label ^Automated install
-		linux @KERNEL_DI@
-		initrd @INITRD_DI@
-		append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+		label auto
+			menu label ^Automated install
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+
+		label rescue
+			menu label ^Rescue mode
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+	menu end
 
-	menu begin darkinstall
-		menu label Accessible ^dark contrast installer options
-		menu title Accessible dark contrast installer options
+	menu begin textinstalldark
+		menu label Text installer with dar^k theme
+		menu title Text installer with dark theme
 		include stdmenu.cfg
 		label mainmenu
 			menu label ^Back..
@@ -56,16 +65,16 @@ menu begin install
 			initrd @INITRD_DI@
 			append priority=low vga=788 theme=dark @APPEND_INSTALL@
 
-		label darkrescue
-			menu label ^Rescue mode
-			linux @KERNEL_DI@
-			initrd @INITRD_DI@
-			append rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
-
 		label darkauto
 			menu label ^Automated install
 			linux @KERNEL_DI@
 			initrd @INITRD_DI@
 			append auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+
+		label darkrescue
+			menu label ^Rescue mode
+			linux @KERNEL_DI@
+			initrd @INITRD_DI@
+			append rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
 	menu end
 menu end