From 578dbee516a370935e1b2e49205c524370e1f8d0 Mon Sep 17 00:00:00 2001
From: Lyndon Brown <jnqnfe@gmail.com>
Date: Thu, 29 Jan 2015 00:33:25 +0000
Subject: 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
---
 scripts/build/binary_syslinux                   | 8 ++++++--
 share/bootloaders/grub-pc/grub.cfg              | 2 +-
 share/bootloaders/syslinux_common/advanced.cfg  | 5 -----
 share/bootloaders/syslinux_common/menu.cfg      | 7 ++++---
 share/bootloaders/syslinux_common/utilities.cfg | 5 +++++
 5 files changed, 16 insertions(+), 11 deletions(-)
 delete mode 100644 share/bootloaders/syslinux_common/advanced.cfg
 create mode 100644 share/bootloaders/syslinux_common/utilities.cfg

diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index c3968712c..34ce02b86 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -147,6 +147,10 @@ else
 	rm "${_TARGET}"/install_gui.cfg
 	mv "${_TARGET}"/install_text.cfg "${_TARGET}"/install.cfg
 fi
+# Move user advanced.cfg to utilities.cfg for backwards compatibility
+if [ -e "${_TARGET}"/advanced.cfg ]; then
+	mv -f "${_TARGET}"/advanced.cfg "${_TARGET}"/utilities.cfg
+fi
 
 # Configuring files
 if [ -e "${_TARGET}/live.cfg.in" ]
@@ -281,9 +285,9 @@ fi
 # Replace placeholder for optional memtest menu entry include
 if [ ! -f "binary/${MEMTEST_PATH}" ]; then
 	rm -f "${_TARGET}"/memtest.cfg
-	sed -i -e "#@OPTIONAL_MEMTEST_INCLUDE@#d" "${_TARGET}"/advanced.cfg
+	sed -i -e "#@OPTIONAL_MEMTEST_INCLUDE@#d" "${_TARGET}"/utilities.cfg
 else
-	sed -i -e "s#@OPTIONAL_MEMTEST_INCLUDE@#include memtest.cfg#g" "${_TARGET}"/advanced.cfg
+	sed -i -e "s#@OPTIONAL_MEMTEST_INCLUDE@#include memtest.cfg#g" "${_TARGET}"/utilities.cfg
 fi
 
 if [ -e "${_TARGET}/splash.svg" ] && [ ! -e "${_TARGET}/splash.png" ]
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/advanced.cfg b/share/bootloaders/syslinux_common/advanced.cfg
deleted file mode 100644
index dca5f1ca4..000000000
--- a/share/bootloaders/syslinux_common/advanced.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-label hdt
-	menu label ^Hardware Detection Tool (HDT)
-	com32 hdt.c32
-
-@OPTIONAL_MEMTEST_INCLUDE@
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/utilities.cfg b/share/bootloaders/syslinux_common/utilities.cfg
new file mode 100644
index 000000000..dca5f1ca4
--- /dev/null
+++ b/share/bootloaders/syslinux_common/utilities.cfg
@@ -0,0 +1,5 @@
+label hdt
+	menu label ^Hardware Detection Tool (HDT)
+	com32 hdt.c32
+
+@OPTIONAL_MEMTEST_INCLUDE@
-- 
cgit v1.2.3