From 578dbee516a370935e1b2e49205c524370e1f8d0 Mon Sep 17 00:00:00 2001 From: Lyndon Brown 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 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'scripts') 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" ] -- cgit v1.2.3