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
This commit is contained in:
parent
d22c1f177d
commit
578dbee516
|
@ -147,6 +147,10 @@ else
|
||||||
rm "${_TARGET}"/install_gui.cfg
|
rm "${_TARGET}"/install_gui.cfg
|
||||||
mv "${_TARGET}"/install_text.cfg "${_TARGET}"/install.cfg
|
mv "${_TARGET}"/install_text.cfg "${_TARGET}"/install.cfg
|
||||||
fi
|
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
|
# Configuring files
|
||||||
if [ -e "${_TARGET}/live.cfg.in" ]
|
if [ -e "${_TARGET}/live.cfg.in" ]
|
||||||
|
@ -281,9 +285,9 @@ fi
|
||||||
# Replace placeholder for optional memtest menu entry include
|
# Replace placeholder for optional memtest menu entry include
|
||||||
if [ ! -f "binary/${MEMTEST_PATH}" ]; then
|
if [ ! -f "binary/${MEMTEST_PATH}" ]; then
|
||||||
rm -f "${_TARGET}"/memtest.cfg
|
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
|
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
|
fi
|
||||||
|
|
||||||
if [ -e "${_TARGET}/splash.svg" ] && [ ! -e "${_TARGET}/splash.png" ]
|
if [ -e "${_TARGET}/splash.svg" ] && [ ! -e "${_TARGET}/splash.png" ]
|
||||||
|
|
|
@ -32,7 +32,7 @@ submenu 'Advanced install options ...' --hotkey=a {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if @ENABLE_MEMTEST@; then
|
if @ENABLE_MEMTEST@; then
|
||||||
submenu 'Advanced options ...' {
|
submenu 'Utilities...' --hotkey=u {
|
||||||
|
|
||||||
source /boot/grub/theme.cfg
|
source /boot/grub/theme.cfg
|
||||||
|
|
||||||
|
|
|
@ -5,13 +5,14 @@ menu title Boot menu
|
||||||
include stdmenu.cfg
|
include stdmenu.cfg
|
||||||
include live.cfg
|
include live.cfg
|
||||||
@OPTIONAL_INSTALLER_INCLUDE@
|
@OPTIONAL_INSTALLER_INCLUDE@
|
||||||
menu begin advanced
|
menu begin utilities
|
||||||
menu label Advanced options
|
menu label ^Utilities
|
||||||
|
menu title Utilities
|
||||||
include stdmenu.cfg
|
include stdmenu.cfg
|
||||||
label mainmenu
|
label mainmenu
|
||||||
menu label ^Back..
|
menu label ^Back..
|
||||||
menu exit
|
menu exit
|
||||||
include advanced.cfg
|
include utilities.cfg
|
||||||
menu end
|
menu end
|
||||||
|
|
||||||
menu clear
|
menu clear
|
||||||
|
|
Loading…
Reference in New Issue