summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--share/bootloaders/grub-pc/install_gui.cfg113
-rw-r--r--share/bootloaders/grub-pc/install_start_gui.cfg5
-rw-r--r--share/bootloaders/grub-pc/install_text.cfg45
-rw-r--r--share/bootloaders/syslinux_common/install_gui.cfg187
-rw-r--r--share/bootloaders/syslinux_common/install_text.cfg69
5 files changed, 243 insertions, 176 deletions
diff --git a/share/bootloaders/grub-pc/install_gui.cfg b/share/bootloaders/grub-pc/install_gui.cfg
index dd8888b32..61be681ca 100644
--- a/share/bootloaders/grub-pc/install_gui.cfg
+++ b/share/bootloaders/grub-pc/install_gui.cfg
@@ -1,109 +1,124 @@
-menuentry 'Graphical install' --hotkey=g {
- linux @KERNEL_GI@ vga=788 @APPEND_INSTALL@ --- quiet
- initrd @INITRD_GI@
-}
+submenu 'Graphical installer ...' --hotkey=g {
-menuentry 'Graphical expert install' --hotkey=x {
- linux @KERNEL_GI@ priority=low vga=788 @APPEND_INSTALL@
- initrd @INITRD_GI@
-}
+ source /boot/grub/theme.cfg
-menuentry 'Graphical rescue mode' --hotkey=r {
- linux @KERNEL_GI@ rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
- initrd @INITRD_GI@
-}
+ menuentry 'Install' --hotkey=i {
+ linux @KERNEL_GI@ vga=788 @APPEND_INSTALL@ --- quiet
+ initrd @INITRD_GI@
+ }
-menuentry 'Graphical automated install' --hotkey=a {
- linux @KERNEL_GI@ auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
- initrd @INITRD_GI@
-}
+ menuentry 'Expert install' --hotkey=x {
+ linux @KERNEL_GI@ priority=low vga=788 @APPEND_INSTALL@
+ initrd @INITRD_GI@
+ }
-menuentry 'Install' --hotkey=i {
- linux @KERNEL_DI@ vga=788 @APPEND_INSTALL@ --- quiet
- initrd @INITRD_DI@
-}
+ menuentry 'Automated install' --hotkey=a {
+ linux @KERNEL_GI@ auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+ initrd @INITRD_GI@
+ }
-menuentry 'Expert install' {
- linux @KERNEL_DI@ priority=low vga=788 @APPEND_INSTALL@
- initrd @INITRD_DI@
+ menuentry 'Rescue mode' --hotkey=r {
+ linux @KERNEL_GI@ rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+ initrd @INITRD_GI@
+ }
}
-menuentry 'Rescue mode' {
- linux @KERNEL_DI@ rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
- initrd @INITRD_DI@
-}
+submenu 'Text installer ...' --hotkey=t {
+
+ source /boot/grub/theme.cfg
+
+ menuentry 'Install' --hotkey=i {
+ linux @KERNEL_DI@ vga=788 @APPEND_INSTALL@ --- quiet
+ initrd @INITRD_DI@
+ }
+
+ menuentry 'Expert install' --hotkey=x {
+ linux @KERNEL_DI@ priority=low vga=788 @APPEND_INSTALL@
+ initrd @INITRD_DI@
+ }
+
+ menuentry 'Automated install' --hotkey=a {
+ linux @KERNEL_DI@ auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+ initrd @INITRD_DI@
+ }
-menuentry 'Automated install' {
- linux @KERNEL_DI@ auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
- initrd @INITRD_DI@
+ menuentry 'Rescue mode' --hotkey=r {
+ linux @KERNEL_DI@ rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+ initrd @INITRD_DI@
+ }
}
-submenu 'Accessible dark contrast installer options ...' --hotkey=d {
+submenu 'Graphical installer with dark theme ...' --hotkey=d {
source /boot/grub/theme.cfg
- menuentry 'Graphical install' --hotkey=g {
+ menuentry 'Install' --hotkey=i {
linux @KERNEL_GI@ vga=788 theme=dark @APPEND_INSTALL@ --- quiet
initrd @INITRD_GI@
}
- menuentry 'Graphical expert install' --hotkey=x {
+ menuentry 'Expert install' --hotkey=x {
linux @KERNEL_GI@ priority=low vga=788 theme=dark @APPEND_INSTALL@
initrd @INITRD_GI@
}
- menuentry 'Graphical rescue mode' --hotkey=r {
- linux @KERNEL_GI@ rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+ menuentry 'Automated install' --hotkey=a {
+ linux @KERNEL_GI@ auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
initrd @INITRD_GI@
}
- menuentry 'Graphical automated install' --hotkey=a {
- linux @KERNEL_GI@ auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+ menuentry 'Rescue mode' --hotkey=r {
+ linux @KERNEL_GI@ rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
initrd @INITRD_GI@
}
+}
+
+submenu 'Text installer with dark theme ...' --hotkey=k {
+
+ source /boot/grub/theme.cfg
menuentry 'Install' --hotkey=i {
linux @KERNEL_DI@ vga=788 theme=dark @APPEND_INSTALL@ --- quiet
initrd @INITRD_DI@
}
- menuentry 'Expert install' {
+ menuentry 'Expert install' --hotkey=x {
linux @KERNEL_DI@ priority=low vga=788 theme=dark @APPEND_INSTALL@
initrd @INITRD_DI@
}
- menuentry 'Rescue mode' {
- linux @KERNEL_DI@ rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+ menuentry 'Automated install' --hotkey=a {
+ linux @KERNEL_DI@ auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
initrd @INITRD_DI@
}
- menuentry 'Automated install' {
- linux @KERNEL_DI@ auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+ menuentry 'Rescue mode' --hotkey=r {
+ linux @KERNEL_DI@ rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
initrd @INITRD_DI@
}
}
-submenu 'Speech-enabled install options ...' --hotkey=s {
+submenu 'Installer with speech synthesis ...' --hotkey=s {
source /boot/grub/theme.cfg
- menuentry 'Install with speech synthesis' --hotkey=s {
+ menuentry 'Install' --hotkey=i {
linux @KERNEL_GI@ speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
initrd @INITRD_GI@
}
- menuentry 'Expert speech install' --hotkey=x {
+ menuentry 'Expert 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
+ menuentry 'Automated install' --hotkey=a {
+ linux @KERNEL_GI@ speakup.synth=soft auto=true priority=critical 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
+ menuentry 'Rescue mode' --hotkey=r {
+ linux @KERNEL_GI@ speakup.synth=soft rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
initrd @INITRD_GI@
}
}
diff --git a/share/bootloaders/grub-pc/install_start_gui.cfg b/share/bootloaders/grub-pc/install_start_gui.cfg
index 94c61b367..92dde1713 100644
--- a/share/bootloaders/grub-pc/install_start_gui.cfg
+++ b/share/bootloaders/grub-pc/install_start_gui.cfg
@@ -2,3 +2,8 @@ menuentry 'Start installer' --hotkey=i {
linux @KERNEL_GI@ vga=788 @APPEND_INSTALL@ --- quiet
initrd @INITRD_GI@
}
+
+menuentry 'Start installer with speech synthesis' --hotkey=s {
+ linux @KERNEL_GI@ speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
+ initrd @INITRD_GI@
+}
diff --git a/share/bootloaders/grub-pc/install_text.cfg b/share/bootloaders/grub-pc/install_text.cfg
index 1c113b806..dc6b22270 100644
--- a/share/bootloaders/grub-pc/install_text.cfg
+++ b/share/bootloaders/grub-pc/install_text.cfg
@@ -1,24 +1,29 @@
-menuentry 'Install' --hotkey=i {
- linux @KERNEL_DI@ vga=788 @APPEND_INSTALL@ --- quiet
- initrd @INITRD_DI@
-}
+submenu 'Text installer ...' --hotkey=t {
-menuentry 'Expert install' --hotkey=x {
- linux @KERNEL_DI@ priority=low vga=788 @APPEND_INSTALL@
- initrd @INITRD_DI@
-}
+ source /boot/grub/theme.cfg
-menuentry 'Rescue mode' --hotkey=r {
- linux @KERNEL_DI@ rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
- initrd @INITRD_DI@
-}
+ menuentry 'Install' --hotkey=i {
+ linux @KERNEL_DI@ vga=788 @APPEND_INSTALL@ --- quiet
+ initrd @INITRD_DI@
+ }
+
+ menuentry 'Expert install' --hotkey=x {
+ linux @KERNEL_DI@ priority=low vga=788 @APPEND_INSTALL@
+ initrd @INITRD_DI@
+ }
+
+ menuentry 'Automated install' --hotkey=a {
+ linux @KERNEL_DI@ auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+ initrd @INITRD_DI@
+ }
-menuentry 'Automated install' --hotkey=a {
- linux @KERNEL_DI@ auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
- initrd @INITRD_DI@
+ menuentry 'Rescue mode' --hotkey=r {
+ linux @KERNEL_DI@ rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+ initrd @INITRD_DI@
+ }
}
-submenu 'Accessible dark contrast installer options ...' --hotkey=d {
+submenu 'Text installer with dark theme ...' --hotkey=k {
source /boot/grub/theme.cfg
@@ -32,13 +37,13 @@ submenu 'Accessible dark contrast installer options ...' --hotkey=d {
initrd @INITRD_DI@
}
- menuentry 'Rescue mode' --hotkey=r {
- linux @KERNEL_DI@ rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+ menuentry 'Automated install' --hotkey=a {
+ linux @KERNEL_DI@ auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
initrd @INITRD_DI@
}
- menuentry 'Automated install' --hotkey=a {
- linux @KERNEL_DI@ auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+ menuentry 'Rescue mode' --hotkey=r {
+ linux @KERNEL_DI@ rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
initrd @INITRD_DI@
}
}
diff --git a/share/bootloaders/syslinux_common/install_gui.cfg b/share/bootloaders/syslinux_common/install_gui.cfg
index b568f64e8..9788fb26b 100644
--- a/share/bootloaders/syslinux_common/install_gui.cfg
+++ b/share/bootloaders/syslinux_common/install_gui.cfg
@@ -1,9 +1,15 @@
-label installgui
+label installstart
menu label Start ^installer
linux @KERNEL_GI@
initrd @INITRD_GI@
append vga=788 @APPEND_INSTALL@ --- quiet
+label installstartspeech
+ menu label Start installer with ^speech synthesis
+ linux @KERNEL_GI@
+ initrd @INITRD_GI@
+ append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
+
menu begin install
menu label ^Advanced install options
menu title Advanced install options
@@ -12,85 +18,112 @@ menu begin install
menu label ^Back..
menu exit
- label installgui
- menu label ^Graphical install
- linux @KERNEL_GI@
- initrd @INITRD_GI@
- append vga=788 @APPEND_INSTALL@ --- quiet
-
- label expertgui
- menu label Graphical e^xpert install
- linux @KERNEL_GI@
- initrd @INITRD_GI@
- append priority=low vga=788 @APPEND_INSTALL@
-
- label rescuegui
- menu label Graphical ^rescue mode
- linux @KERNEL_GI@
- initrd @INITRD_GI@
- append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
-
- label autogui
- menu label Graphical ^automated install
- linux @KERNEL_GI@
- initrd @INITRD_GI@
- append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
-
- label install
- menu label ^Install
- linux @KERNEL_DI@
- initrd @INITRD_DI@
- append vga=788 @APPEND_INSTALL@ --- quiet
-
- label expert
- menu label Expert install
- linux @KERNEL_DI@
- initrd @INITRD_DI@
- append priority=low vga=788 @APPEND_INSTALL@
-
- label rescue
- menu label Rescue mode
- linux @KERNEL_DI@
- initrd @INITRD_DI@
- append rescue/enable=true 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
-
- menu begin darkinstall
- menu label Accessible ^dark contrast installer options
- menu title Accessible dark contrast installer options
+ menu begin graphicalinstall
+ menu label ^Graphical installer
+ menu title Graphical installer
+ include stdmenu.cfg
+ label mainmenu
+ menu label ^Back..
+ menu exit
+
+ label installgui
+ menu label ^Install
+ linux @KERNEL_GI@
+ initrd @INITRD_GI@
+ append vga=788 @APPEND_INSTALL@ --- quiet
+
+ label expertgui
+ menu label E^xpert install
+ linux @KERNEL_GI@
+ initrd @INITRD_GI@
+ append priority=low vga=788 @APPEND_INSTALL@
+
+ label autogui
+ menu label ^Automated install
+ linux @KERNEL_GI@
+ initrd @INITRD_GI@
+ append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+
+ label rescuegui
+ menu label ^Rescue mode
+ linux @KERNEL_GI@
+ initrd @INITRD_GI@
+ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+ menu end
+
+ menu begin textinstall
+ menu label ^Text installer
+ menu title Text installer
+ include stdmenu.cfg
+ label mainmenu
+ menu label ^Back..
+ menu exit
+
+ label install
+ menu label ^Install
+ linux @KERNEL_DI@
+ initrd @INITRD_DI@
+ append 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 rescue
+ menu label ^Rescue mode
+ linux @KERNEL_DI@
+ initrd @INITRD_DI@
+ append rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+ menu end
+
+ menu begin graphicalinstalldark
+ menu label Graphical installer with ^dark theme
+ menu title Graphical installer with dark theme
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu exit
label darkinstallgui
- menu label ^Graphical install
+ menu label ^Install
linux @KERNEL_GI@
initrd @INITRD_GI@
append vga=788 theme=dark @APPEND_INSTALL@ --- quiet
label darkexpertgui
- menu label Graphical e^xpert install
+ menu label E^xpert install
linux @KERNEL_GI@
initrd @INITRD_GI@
append priority=low vga=788 theme=dark @APPEND_INSTALL@
- label darkrescuegui
- menu label Graphical ^rescue mode
+ label darkautogui
+ menu label ^Automated install
linux @KERNEL_GI@
initrd @INITRD_GI@
- append rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+ append auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
- label darkautogui
- menu label Graphical ^automated install
+ label darkrescuegui
+ menu label ^Rescue mode
linux @KERNEL_GI@
initrd @INITRD_GI@
- append auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+ append rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+ menu end
+
+ 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..
+ menu exit
label darkinstall
menu label ^Install
@@ -99,54 +132,54 @@ menu begin install
append vga=788 theme=dark @APPEND_INSTALL@ --- quiet
label darkexpert
- menu label Expert install
+ menu label E^xpert install
linux @KERNEL_DI@
initrd @INITRD_DI@
append priority=low vga=788 theme=dark @APPEND_INSTALL@
- label darkrescue
- menu label Rescue mode
+ label darkauto
+ menu label ^Automated install
linux @KERNEL_DI@
initrd @INITRD_DI@
- append rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+ append auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
- label darkauto
- menu label Automated install
+ label darkrescue
+ menu label ^Rescue mode
linux @KERNEL_DI@
initrd @INITRD_DI@
- append auto=true priority=critical vga=788 theme=dark @APPEND_INSTALL@ --- quiet
+ append rescue/enable=true vga=788 theme=dark @APPEND_INSTALL@ --- quiet
menu end
menu begin speechinstall
- menu label ^Speech-enabled install options
- menu title Speech-enabled install options
+ menu label Installer with ^speech synthesis
+ menu title Installer with speech synthesis
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu exit
label installspeechsynth
- menu label Install with ^speech synthesis
+ menu label ^Install
linux @KERNEL_GI@
initrd @INITRD_GI@
append speakup.synth=soft vga=788 @APPEND_INSTALL@ --- quiet
label expertguispeech
- menu label E^xpert speech install
+ menu label E^xpert install
linux @KERNEL_GI@
initrd @INITRD_GI@
append speakup.synth=soft priority=low vga=788 @APPEND_INSTALL@
- label rescueguispeech
- menu label ^Rescue speech mode
+ label autoguispeech
+ menu label ^Automated install
linux @KERNEL_GI@
initrd @INITRD_GI@
- append speakup.synth=soft rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
+ append speakup.synth=soft auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
- label autoguispeech
- menu label ^Automated speech install
+ label rescueguispeech
+ menu label ^Rescue mode
linux @KERNEL_GI@
initrd @INITRD_GI@
- append speakup.synth=soft auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
+ append speakup.synth=soft rescue/enable=true vga=788 @APPEND_INSTALL@ --- quiet
menu end
menu end
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
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 22:31:01 +0000