From 9b2564a3ff2264ce3fabd02165f6e86b3a4f2621 Mon Sep 17 00:00:00 2001
From: Lyndon Brown <jnqnfe@gmail.com>
Date: Sat, 4 Apr 2020 05:10:13 +0100
Subject: [PATCH] bootloaders: add advanced speech synth install entries

following the presence of them in the official install discs.

also drops unnecessary word "graphical" from existing speech
synth entry, following official Debian install discs.

i've not bothered to update grub-legacy this time.

Gbp-Dch: Short
---
 share/bootloaders/grub-pc/install_gui.cfg     | 26 +++++++++++--
 .../syslinux_common/install_gui.cfg           | 37 ++++++++++++++++---
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/share/bootloaders/grub-pc/install_gui.cfg b/share/bootloaders/grub-pc/install_gui.cfg
index 399877017..38ed76cbf 100644
--- a/share/bootloaders/grub-pc/install_gui.cfg
+++ b/share/bootloaders/grub-pc/install_gui.cfg
@@ -38,7 +38,27 @@ menuentry 'Automated install' {
 	initrd	@INITRD_DI@
 }
 
-menuentry 'Install with speech synthesis' --hotkey=s {
-	linux	@KERNEL_GI@ speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
-	initrd	@INITRD_GI@
+submenu 'Speech-enabled install options ...' --hotkey=s {
+
+	source /boot/grub/theme.cfg
+
+	menuentry 'Install with speech synthesis' --hotkey=s {
+		linux	@KERNEL_GI@ speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
+		initrd	@INITRD_GI@
+	}
+
+	menuentry 'Expert speech install' --hotkey=x {
+		linux	@KERNEL_GI@ speakup.synth=soft priority=low vga=788 @APPEND_INSTALL@
+		initrd	@INITRD_GI@
+	}
+
+	menuentry 'Rescue speech mode' --hotkey=r {
+		linux	@KERNEL_GI@ speakup.synth=soft rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+		initrd	@INITRD_GI@
+	}
+
+	menuentry 'Automated speech install' --hotkey=a {
+		linux	@KERNEL_GI@ speakup.synth=soft auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+		initrd	@INITRD_GI@
+	}
 }
diff --git a/share/bootloaders/syslinux_common/install_gui.cfg b/share/bootloaders/syslinux_common/install_gui.cfg
index 20f43aff9..82e409d71 100644
--- a/share/bootloaders/syslinux_common/install_gui.cfg
+++ b/share/bootloaders/syslinux_common/install_gui.cfg
@@ -60,9 +60,36 @@ menu begin install
 		initrd @INITRD_DI@
 		append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
 
-	label installspeechsynth
-		menu label Graphical install with ^speech synthesis
-		linux @KERNEL_GI@
-		initrd @INITRD_GI@
-		append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
+	menu begin speechinstall
+		menu label ^Speech-enabled install options
+		menu title Speech-enabled install options
+		include stdmenu.cfg
+		label mainmenu
+			menu label ^Back..
+			menu exit
+
+		label installspeechsynth
+			menu label Install with ^speech synthesis
+			linux @KERNEL_GI@
+			initrd @INITRD_GI@
+			append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
+
+		label expertguispeech
+			menu label E^xpert speech install
+			linux @KERNEL_GI@
+			initrd @INITRD_GI@
+			append speakup.synth=soft priority=low vga=788 @APPEND_INSTALL@
+
+		label rescueguispeech
+			menu label ^Rescue speech mode
+			linux @KERNEL_GI@
+			initrd @INITRD_GI@
+			append speakup.synth=soft rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+
+		label autoguispeech
+			menu label ^Automated speech install
+			linux @KERNEL_GI@
+			initrd @INITRD_GI@
+			append speakup.synth=soft auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+	menu end
 menu end