manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Synchronize syslinux menu structure with the grub-pc one 

* Use same menu labels
* Use same hotkeys
* Get rid of a nested menu that is not present in grub
* Add "menu title" statement to hide the caret of the hotkey (^)
This commit is contained in:
Raphaël Hertzog 2020-04-24 17:56:22 +02:00
parent 47b0a623dd
commit 34a72caf49
13 changed files with 214 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
share/bootloaders/extlinux/install_gui.cfg
View File

@ -5,7 +5,8 @@ label installgui
append vga=788 @APPEND_INSTALL@ --- quiet
menu begin install
menu label ^Install options
menu label ^Advanced install options
menu title Advanced install options
include stdmenu.cfg
label mainmenu
menu label ^Back..
@ -17,55 +18,47 @@ menu begin install
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
menu begin advinstall
menu label ^Advanced install options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu exit
label expert
menu label Expert install
linux @KERNEL_DI@
initrd @INITRD_DI@
append priority=low vga=788 @APPEND_INSTALL@
label expertgui
menu label Graphical ^expert install
linux @KERNEL_GI@
initrd @INITRD_GI@
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 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 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 end
label auto
menu label Automated install
linux @KERNEL_DI@
initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
label installspeechsynth
menu label Graphical install with ^speech synthesis

41
share/bootloaders/extlinux/install_text.cfg
View File

@ -5,7 +5,8 @@ label installgui
append vga=788 @APPEND_INSTALL@ --- quiet
menu begin install
menu label ^Install options
menu label ^Advanced install options
menu title Advanced install options
include stdmenu.cfg
label mainmenu
menu label ^Back..
@ -17,29 +18,21 @@ menu begin install
initrd @INITRD_DI@
append vga=788 @APPEND_INSTALL@ --- quiet
menu begin advinstall
menu label ^Advanced install options
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 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 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 end
label auto
menu label ^Automated install
linux @KERNEL_DI@
initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
menu end

2
share/bootloaders/extlinux/menu.cfg
View File

@ -6,7 +6,7 @@ include stdmenu.cfg
include live.cfg
@OPTIONAL_INSTALLER_INCLUDE@
menu begin advanced
menu label ^Advanced options
menu label Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..

4
share/bootloaders/grub-pc/grub.cfg
View File

@ -49,7 +49,7 @@ if @ENABLE_INSTALL_MENU@; then
@LINUX_INSTALL@
submenu 'Advanced install options...' {
submenu 'Advanced install options...' --hotkey=a {
# More installer entries (if any)
@LINUX_ADVANCED_INSTALL@
@ -58,7 +58,7 @@ submenu 'Advanced install options...' {
fi
if @ENABLE_MEMTEST@; then
submenu 'Advanced options...' --hotkey=a {
submenu 'Advanced options...' {
# Memtest (if any)
source /boot/grub/memtest.cfg

77
share/bootloaders/isolinux/install_gui.cfg
View File

@ -5,7 +5,8 @@ label installgui
append vga=788 @APPEND_INSTALL@ --- quiet
menu begin install
menu label ^Install options
menu label ^Advanced install options
menu title Advanced install options
include stdmenu.cfg
label mainmenu
menu label ^Back..
@ -17,55 +18,47 @@ menu begin install
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
menu begin advinstall
menu label ^Advanced install options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu exit
label expert
menu label Expert install
linux @KERNEL_DI@
initrd @INITRD_DI@
append priority=low vga=788 @APPEND_INSTALL@
label expertgui
menu label Graphical ^expert install
linux @KERNEL_GI@
initrd @INITRD_GI@
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 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 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 end
label auto
menu label Automated install
linux @KERNEL_DI@
initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
label installspeechsynth
menu label Graphical install with ^speech synthesis

41
share/bootloaders/isolinux/install_text.cfg
View File

@ -5,7 +5,8 @@ label installgui
append vga=788 @APPEND_INSTALL@ --- quiet
menu begin install
menu label ^Install options
menu label ^Advanced install options
menu title Advanced install options
include stdmenu.cfg
label mainmenu
menu label ^Back..
@ -17,29 +18,21 @@ menu begin install
initrd @INITRD_DI@
append vga=788 @APPEND_INSTALL@ --- quiet
menu begin advinstall
menu label ^Advanced install options
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 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 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 end
label auto
menu label ^Automated install
linux @KERNEL_DI@
initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
menu end

2
share/bootloaders/isolinux/menu.cfg
View File

@ -6,7 +6,7 @@ include stdmenu.cfg
include live.cfg
@OPTIONAL_INSTALLER_INCLUDE@
menu begin advanced
menu label ^Advanced options
menu label Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..

77
share/bootloaders/pxelinux/install_gui.cfg
View File

@ -5,7 +5,8 @@ label installgui
append vga=788 @APPEND_INSTALL@ --- quiet
menu begin install
menu label ^Install options
menu label ^Advanced install options
menu title Advanced install options
include stdmenu.cfg
label mainmenu
menu label ^Back..
@ -17,55 +18,47 @@ menu begin install
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
menu begin advinstall
menu label ^Advanced install options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu exit
label expert
menu label Expert install
linux @KERNEL_DI@
initrd @INITRD_DI@
append priority=low vga=788 @APPEND_INSTALL@
label expertgui
menu label Graphical ^expert install
linux @KERNEL_GI@
initrd @INITRD_GI@
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 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 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 end
label auto
menu label Automated install
linux @KERNEL_DI@
initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
label installspeechsynth
menu label Graphical install with ^speech synthesis

41
share/bootloaders/pxelinux/install_text.cfg
View File

@ -5,7 +5,8 @@ label installgui
append vga=788 @APPEND_INSTALL@ --- quiet
menu begin install
menu label ^Install options
menu label ^Advanced install options
menu title Advanced install options
include stdmenu.cfg
label mainmenu
menu label ^Back..
@ -17,29 +18,21 @@ menu begin install
initrd @INITRD_DI@
append vga=788 @APPEND_INSTALL@ --- quiet
menu begin advinstall
menu label ^Advanced install options
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 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 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 end
label auto
menu label ^Automated install
linux @KERNEL_DI@
initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
menu end

2
share/bootloaders/pxelinux/menu.cfg
View File

@ -6,7 +6,7 @@ include stdmenu.cfg
include live.cfg
@OPTIONAL_INSTALLER_INCLUDE@
menu begin advanced
menu label ^Advanced options
menu label Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..

77
share/bootloaders/syslinux/install_gui.cfg
View File

@ -5,7 +5,8 @@ label installgui
append vga=788 @APPEND_INSTALL@ --- quiet
menu begin install
menu label ^Install options
menu label ^Advanced install options
menu title Advanced install options
include stdmenu.cfg
label mainmenu
menu label ^Back..
@ -17,55 +18,47 @@ menu begin install
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
menu begin advinstall
menu label ^Advanced install options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu exit
label expert
menu label Expert install
linux @KERNEL_DI@
initrd @INITRD_DI@
append priority=low vga=788 @APPEND_INSTALL@
label expertgui
menu label Graphical ^expert install
linux @KERNEL_GI@
initrd @INITRD_GI@
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 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 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 end
label auto
menu label Automated install
linux @KERNEL_DI@
initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
label installspeechsynth
menu label Graphical install with ^speech synthesis

41
share/bootloaders/syslinux/install_text.cfg
View File

@ -5,7 +5,8 @@ label installgui
append vga=788 @APPEND_INSTALL@ --- quiet
menu begin install
menu label ^Install options
menu label ^Advanced install options
menu title Advanced install options
include stdmenu.cfg
label mainmenu
menu label ^Back..
@ -17,29 +18,21 @@ menu begin install
initrd @INITRD_DI@
append vga=788 @APPEND_INSTALL@ --- quiet
menu begin advinstall
menu label ^Advanced install options
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 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 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 end
label auto
menu label ^Automated install
linux @KERNEL_DI@
initrd @INITRD_DI@
append auto=true priority=critical vga=788 @APPEND_INSTALL@ --- quiet
menu end

2
share/bootloaders/syslinux/menu.cfg
View File

@ -6,7 +6,7 @@ include stdmenu.cfg
include live.cfg
@OPTIONAL_INSTALLER_INCLUDE@
menu begin advanced
menu label ^Advanced options
menu label Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..