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

syslinux: properly fix shortcut caret appearing in menu entries 

this reverts commit 0cef87ffca though
retaining the 'advanced options' menu entry using a label rather than a
title.

despite having done a lot of testing back in 2015 with my bootloader
improvements, i notice now that in fact the syslinux caret fix has an
undesired side effect of modifying the title displayed above the menus. it
does not help that the text embedded into the splash overlaps with this
menu title; perhaps this explains why i missed this problem back in 2015.

purely reverting the implemented fix solves this title problem, but
restores the caret problem to the advanced options menu (in menu.cfg);
however that menu was using a caret in a title entry, unlike everywhere
else where they are only used with labels, which must have been the
original source of the problem all along. ensuring that this menu uses a
label instead of a title in this reversion leaves everything working
correctly afaict.

Gbp-Dch: Ignore
This commit is contained in:
Lyndon Brown 2020-03-25 00:01:46 +00:00
parent 36092f1cb8
commit 8775c8075c
24 changed files with 0 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
share/bootloaders/extlinux/advanced.cfg
View File

@ -1,6 +1,5 @@
label hdt
menu label ^Hardware Detection Tool (HDT)
menu title Hardware Detection Tool (HDT)
com32 hdt.c32
@OPTIONAL_MEMTEST_INCLUDE@

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

@ -1,52 +1,43 @@
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 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 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 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 vga=788 @APPEND_INSTALL@ --- quiet
@ -72,7 +63,6 @@ menu begin install
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

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

@ -1,26 +1,21 @@
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

1
share/bootloaders/extlinux/live.cfg.in
View File

@ -1,6 +1,5 @@
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu title Live (@FLAVOUR@)
menu default
linux @LINUX@
initrd @INITRD@

1
share/bootloaders/extlinux/memtest.cfg
View File

@ -1,4 +1,3 @@
label memtest
menu label ^Memory Diagnostic Tool (@MEMTEST_VERSION@)
menu title Memory Diagnostic Tool (@MEMTEST_VERSION@)
linux @MEMTEST@

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

@ -7,11 +7,9 @@ include live.cfg
@OPTIONAL_INSTALLER_INCLUDE@
menu begin advanced
menu label ^Advanced options
menu title Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu title Back..
menu exit
include advanced.cfg
menu end

1
share/bootloaders/isolinux/advanced.cfg
View File

@ -1,6 +1,5 @@
label hdt
menu label ^Hardware Detection Tool (HDT)
menu title Hardware Detection Tool (HDT)
com32 hdt.c32
@OPTIONAL_MEMTEST_INCLUDE@

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

@ -1,52 +1,43 @@
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 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 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 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 vga=788 @APPEND_INSTALL@ --- quiet
@ -72,7 +63,6 @@ menu begin install
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

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

@ -1,26 +1,21 @@
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

1
share/bootloaders/isolinux/live.cfg.in
View File

@ -1,6 +1,5 @@
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu title Live (@FLAVOUR@)
menu default
linux @LINUX@
initrd @INITRD@

1
share/bootloaders/isolinux/memtest.cfg
View File

@ -1,4 +1,3 @@
label memtest
menu label ^Memory Diagnostic Tool (@MEMTEST_VERSION@)
menu title Memory Diagnostic Tool (@MEMTEST_VERSION@)
linux @MEMTEST@

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

@ -7,11 +7,9 @@ include live.cfg
@OPTIONAL_INSTALLER_INCLUDE@
menu begin advanced
menu label ^Advanced options
menu title Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu title Back..
menu exit
include advanced.cfg
menu end

1
share/bootloaders/pxelinux/advanced.cfg
View File

@ -1,6 +1,5 @@
label hdt
menu label ^Hardware Detection Tool (HDT)
menu title Hardware Detection Tool (HDT)
com32 hdt.c32
@OPTIONAL_MEMTEST_INCLUDE@

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

@ -1,52 +1,43 @@
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 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 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 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 vga=788 @APPEND_INSTALL@ --- quiet
@ -72,7 +63,6 @@ menu begin install
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

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

@ -1,26 +1,21 @@
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

1
share/bootloaders/pxelinux/live.cfg.in
View File

@ -1,6 +1,5 @@
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu title Live (@FLAVOUR@)
menu default
linux @LINUX@
initrd @INITRD@

1
share/bootloaders/pxelinux/memtest.cfg
View File

@ -1,4 +1,3 @@
label memtest
menu label ^Memory Diagnostic Tool (@MEMTEST_VERSION@)
menu title Memory Diagnostic Tool (@MEMTEST_VERSION@)
linux @MEMTEST@

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

@ -7,11 +7,9 @@ include live.cfg
@OPTIONAL_INSTALLER_INCLUDE@
menu begin advanced
menu label ^Advanced options
menu title Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu title Back..
menu exit
include advanced.cfg
menu end

1
share/bootloaders/syslinux/advanced.cfg
View File

@ -1,6 +1,5 @@
label hdt
menu label ^Hardware Detection Tool (HDT)
menu title Hardware Detection Tool (HDT)
com32 hdt.c32
@OPTIONAL_MEMTEST_INCLUDE@

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

@ -1,52 +1,43 @@
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 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 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 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 vga=788 @APPEND_INSTALL@ --- quiet
@ -72,7 +63,6 @@ menu begin install
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

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

@ -1,45 +1,37 @@
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

1
share/bootloaders/syslinux/live.cfg.in
View File

@ -1,6 +1,5 @@
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu title Live (@FLAVOUR@)
menu default
linux @LINUX@
initrd @INITRD@

1
share/bootloaders/syslinux/memtest.cfg
View File

@ -1,4 +1,3 @@
label memtest
menu label ^Memory Diagnostic Tool (@MEMTEST_VERSION@)
menu title Memory Diagnostic Tool (@MEMTEST_VERSION@)
linux @MEMTEST@

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

@ -7,11 +7,9 @@ include live.cfg
@OPTIONAL_INSTALLER_INCLUDE@
menu begin advanced
menu label ^Advanced options
menu title Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu title Back..
menu exit
include advanced.cfg
menu end