summaryrefslogtreecommitdiff
path: root/share/bootloaders
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2015-01-29 00:33:25 +0000
committerRaphaƫl Hertzog <hertzog@debian.org>2020-05-01 12:38:04 +0200
commit578dbee516a370935e1b2e49205c524370e1f8d0 (patch)
tree677419bf16a826e51a43100d2ac0287669207286 /share/bootloaders
parentd22c1f177d7192f1d71743783a88ed6e98e56c6a (diff)
downloadvyos-live-build-578dbee516a370935e1b2e49205c524370e1f8d0.tar.gz
vyos-live-build-578dbee516a370935e1b2e49205c524370e1f8d0.zip
bootloaders: change 'Advanced options' to 'Utilities'
more fitting now that we've moved the advanced installer entries out to a different submenu, leaving just memtest (and HDT on syslinux). the advanced.cfg file is also renamed to utilities.cfg in the syslinux case, but in a backwards compatible way of moving the user advanced.cfg file over the new one, if the user provides a file with the old name. alternatively we could just leave the old name in place, but that would be a little odd. Gbp-Dch: Short
Diffstat (limited to 'share/bootloaders')
-rw-r--r--share/bootloaders/grub-pc/grub.cfg2
-rw-r--r--share/bootloaders/syslinux_common/menu.cfg7
-rw-r--r--share/bootloaders/syslinux_common/utilities.cfg (renamed from share/bootloaders/syslinux_common/advanced.cfg)0
3 files changed, 5 insertions, 4 deletions
diff --git a/share/bootloaders/grub-pc/grub.cfg b/share/bootloaders/grub-pc/grub.cfg
index e3e9fbd49..36b6f61fb 100644
--- a/share/bootloaders/grub-pc/grub.cfg
+++ b/share/bootloaders/grub-pc/grub.cfg
@@ -32,7 +32,7 @@ submenu 'Advanced install options ...' --hotkey=a {
fi
if @ENABLE_MEMTEST@; then
-submenu 'Advanced options ...' {
+submenu 'Utilities...' --hotkey=u {
source /boot/grub/theme.cfg
diff --git a/share/bootloaders/syslinux_common/menu.cfg b/share/bootloaders/syslinux_common/menu.cfg
index 5f77377e2..9579323f3 100644
--- a/share/bootloaders/syslinux_common/menu.cfg
+++ b/share/bootloaders/syslinux_common/menu.cfg
@@ -5,13 +5,14 @@ menu title Boot menu
include stdmenu.cfg
include live.cfg
@OPTIONAL_INSTALLER_INCLUDE@
-menu begin advanced
- menu label Advanced options
+menu begin utilities
+ menu label ^Utilities
+ menu title Utilities
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu exit
- include advanced.cfg
+ include utilities.cfg
menu end
menu clear
diff --git a/share/bootloaders/syslinux_common/advanced.cfg b/share/bootloaders/syslinux_common/utilities.cfg
index dca5f1ca4..dca5f1ca4 100644
--- a/share/bootloaders/syslinux_common/advanced.cfg
+++ b/share/bootloaders/syslinux_common/utilities.cfg