syslinux: expand list of install options

8 files changed, 495 insertions, 104 deletions

diff --git a/share/bootloaders/extlinux/install_gui.cfg b/share/bootloaders/extlinux/install_gui.cfg
index 69b90b9c0..4fabe0587 100644
--- a/share/bootloaders/extlinux/install_gui.cfg
+++ b/share/bootloaders/extlinux/install_gui.cfg
@@ -1,20 +1,79 @@
-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
-
-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
+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 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
+
+	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 video=vesa:ywrap,mtrr 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 video=vesa:ywrap,mtrr 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 video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+		label expert
+			menu label Expert install
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append priority=low vga=788 @APPEND_INSTALL@
+
+		label rescue
+			menu label Rescue mode
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+
+		label auto
+			menu label Automated install
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+	menu end
+
+	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
+menu end
diff --git a/share/bootloaders/extlinux/install_text.cfg b/share/bootloaders/extlinux/install_text.cfg
index 7969d52a0..4320287e3 100644
--- a/share/bootloaders/extlinux/install_text.cfg
+++ b/share/bootloaders/extlinux/install_text.cfg
@@ -1,6 +1,44 @@
-label install
-	menu label ^Install
-	menu title Install
-	linux /install/vmlinuz
-	initrd /install/initrd.gz
-	append vga=788 @APPEND_INSTALL@ --- quiet
+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
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append priority=low vga=788 @APPEND_INSTALL@
+
+		label rescue
+			menu label Rescue mode
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+
+		label auto
+			menu label Automated install
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+	menu end
+menu end
diff --git a/share/bootloaders/isolinux/install_gui.cfg b/share/bootloaders/isolinux/install_gui.cfg
index 69b90b9c0..4fabe0587 100644
--- a/share/bootloaders/isolinux/install_gui.cfg
+++ b/share/bootloaders/isolinux/install_gui.cfg
@@ -1,20 +1,79 @@
-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
-
-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
+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 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
+
+	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 video=vesa:ywrap,mtrr 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 video=vesa:ywrap,mtrr 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 video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+		label expert
+			menu label Expert install
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append priority=low vga=788 @APPEND_INSTALL@
+
+		label rescue
+			menu label Rescue mode
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+
+		label auto
+			menu label Automated install
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+	menu end
+
+	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
+menu end
diff --git a/share/bootloaders/isolinux/install_text.cfg b/share/bootloaders/isolinux/install_text.cfg
index 7969d52a0..6f0e17427 100644
--- a/share/bootloaders/isolinux/install_text.cfg
+++ b/share/bootloaders/isolinux/install_text.cfg
@@ -1,6 +1,44 @@
-label install
-	menu label ^Install
-	menu title Install
-	linux /install/vmlinuz
-	initrd /install/initrd.gz
-	append vga=788 @APPEND_INSTALL@ --- quiet
+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
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append priority=low vga=788 @APPEND_INSTALL@
+
+		label rescue
+			menu label Rescue mode
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+
+		label auto
+			menu label Automated install
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+	menu end
+menu end
diff --git a/share/bootloaders/pxelinux/install_gui.cfg b/share/bootloaders/pxelinux/install_gui.cfg
index 69b90b9c0..4fabe0587 100644
--- a/share/bootloaders/pxelinux/install_gui.cfg
+++ b/share/bootloaders/pxelinux/install_gui.cfg
@@ -1,20 +1,79 @@
-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
-
-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
+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 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
+
+	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 video=vesa:ywrap,mtrr 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 video=vesa:ywrap,mtrr 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 video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+		label expert
+			menu label Expert install
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append priority=low vga=788 @APPEND_INSTALL@
+
+		label rescue
+			menu label Rescue mode
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+
+		label auto
+			menu label Automated install
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+	menu end
+
+	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
+menu end
diff --git a/share/bootloaders/pxelinux/install_text.cfg b/share/bootloaders/pxelinux/install_text.cfg
index 7969d52a0..6f0e17427 100644
--- a/share/bootloaders/pxelinux/install_text.cfg
+++ b/share/bootloaders/pxelinux/install_text.cfg
@@ -1,6 +1,44 @@
-label install
-	menu label ^Install
-	menu title Install
-	linux /install/vmlinuz
-	initrd /install/initrd.gz
-	append vga=788 @APPEND_INSTALL@ --- quiet
+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
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append priority=low vga=788 @APPEND_INSTALL@
+
+		label rescue
+			menu label Rescue mode
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+
+		label auto
+			menu label Automated install
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+	menu end
+menu end
diff --git a/share/bootloaders/syslinux/install_gui.cfg b/share/bootloaders/syslinux/install_gui.cfg
index 69b90b9c0..4fabe0587 100644
--- a/share/bootloaders/syslinux/install_gui.cfg
+++ b/share/bootloaders/syslinux/install_gui.cfg
@@ -1,20 +1,79 @@
-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
-
-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
+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 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
+
+	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 video=vesa:ywrap,mtrr 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 video=vesa:ywrap,mtrr 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 video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
+
+		label expert
+			menu label Expert install
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append priority=low vga=788 @APPEND_INSTALL@
+
+		label rescue
+			menu label Rescue mode
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+
+		label auto
+			menu label Automated install
+			linux /install/vmlinuz
+			initrd /install/initrd.gz
+			append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+	menu end
+
+	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
+menu end
diff --git a/share/bootloaders/syslinux/install_text.cfg b/share/bootloaders/syslinux/install_text.cfg
index 7969d52a0..cf853e48b 100644
--- a/share/bootloaders/syslinux/install_text.cfg
+++ b/share/bootloaders/syslinux/install_text.cfg
@@ -1,6 +1,47 @@
-label install
-	menu label ^Install
-	menu title Install
-	linux /install/vmlinuz
-	initrd /install/initrd.gz
-	append vga=788 @APPEND_INSTALL@ --- quiet
+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
+	menu end
+menu end