diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-25 02:59:44 +0000 |
|---|---|---|
| committer | Raphaël Hertzog <raphael@offensive-security.com> | 2020-04-23 09:59:56 +0200 |
| commit | 077d005a84f9c7b554889afcc196023bf829e86e (patch) | |
| tree | 75db228d8da8685433b93a36617a406beedc6675 | |
| parent | 69093d9e3b7ebc2d3691f683fd447653e211a654 (diff) | |
| download | vyos-live-build-077d005a84f9c7b554889afcc196023bf829e86e.tar.gz vyos-live-build-077d005a84f9c7b554889afcc196023bf829e86e.zip | |
grub2|loopback: extract memtest menu entry creation to config file
backwards compatibility:
1. the new file will be included alongside any user custom config
2. rather than replace MEMTEST with an actual config entry, we replace it
with a line to import the content of the new file, and thus will work
just as before.
thus no backwards compatible breakage
Gbp-Dch: Short
| -rwxr-xr-x | scripts/build/binary_loopback_cfg | 25 | ||||
| -rw-r--r-- | share/bootloaders/grub-pc/grub.cfg | 6 | ||||
| -rw-r--r-- | share/bootloaders/grub-pc/memtest.cfg | 3 |
3 files changed, 18 insertions, 16 deletions
diff --git a/scripts/build/binary_loopback_cfg b/scripts/build/binary_loopback_cfg index acf654885..7fe9a6dad 100755 --- a/scripts/build/binary_loopback_cfg +++ b/scripts/build/binary_loopback_cfg @@ -92,15 +92,6 @@ Grub_live_autodetect_entry () LINUX_LIVE="${LINUX_LIVE}$(Grub_live_autodetect_menu_entry "$@")$NL" } -Grub_memtest_menu_entry () -{ - cat <<END -menuentry "Memory Diagnostic Tool ($LB_MEMTEST)" --hotkey=m { - linux16 /${INITFS}/memtest -} -END -} - # User config replacement/additional files _SOURCE_USER="config/bootloaders/grub-pc" @@ -240,9 +231,13 @@ else fi # Assembling memtest configuration -if [ -f "binary/${INITFS}/memtest" ] -then - MEMTEST="$(Grub_memtest_menu_entry)$NL" +MEMTEST_BIN="/${INITFS}/memtest" +if [ -f "binary/${MEMTEST_BIN}" ]; then + ENABLE_MEMTEST="true" + MEMTEST="source /boot/grub/memtest.cfg" #for backwards compatibility +else + ENABLE_MEMTEST="false" + rm -f binary/boot/grub/memtest.cfg fi escape_for_sed() { @@ -254,7 +249,6 @@ sed -i \ -e "s|@LINUX_LIVE@|$(escape_for_sed "${LINUX_LIVE}")|" \ -e "s|@LINUX_INSTALL@|${LINUX_INSTALL}|" \ -e "s|@LINUX_ADVANCED_INSTALL@|${LINUX_ADVANCED_INSTALL}|" \ - -e "s|@MEMTEST@|$(escape_for_sed "${MEMTEST}")|" \ -e "s|@KERNEL_GI@|${KERNEL_GI}|" \ -e "s|@INITRD_GI@|${INITRD_GI}|" \ -e "s|@APPEND_GI@|${APPEND_GI}|" \ @@ -269,10 +263,13 @@ sed -i \ -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|" \ -e "s|@APPEND_INSTALL@|${LB_BOOTAPPEND_INSTALL}|" \ -e "s|@ENABLE_INSTALL_MENU@|${ENABLE_INSTALL_MENU}|" \ + -e "s|@ENABLE_MEMTEST@|${ENABLE_MEMTEST}|" \ + -e "s|@MEMTEST_BIN@|${MEMTEST_BIN}|" \ + -e "s|@MEMTEST_VERSION@|${LB_MEMTEST}|" \ -e "s|LINUX_LIVE|$(escape_for_sed "${LINUX_LIVE}")|" \ -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" \ -e "s|LINUX_ADVANCED_INSTALL|${LINUX_ADVANCED_INSTALL}|" \ - -e "s|MEMTEST|$(escape_for_sed "${MEMTEST}")|" \ + -e "s|MEMTEST|${MEMTEST}|" \ -e "s|KERNEL_GI|${KERNEL_GI}|" \ -e "s|INITRD_GI|${INITRD_GI}|" \ -e "s|APPEND_GI|${APPEND_GI}|" \ diff --git a/share/bootloaders/grub-pc/grub.cfg b/share/bootloaders/grub-pc/grub.cfg index 8690b097b..03e681f49 100644 --- a/share/bootloaders/grub-pc/grub.cfg +++ b/share/bootloaders/grub-pc/grub.cfg @@ -59,7 +59,9 @@ fi submenu 'Advanced options...' --hotkey=a { -# Memtest (if any) -@MEMTEST@ + # Memtest (if any) + if @ENABLE_MEMTEST@; then + source /boot/grub/memtest.cfg + fi } diff --git a/share/bootloaders/grub-pc/memtest.cfg b/share/bootloaders/grub-pc/memtest.cfg new file mode 100644 index 000000000..454804bb0 --- /dev/null +++ b/share/bootloaders/grub-pc/memtest.cfg @@ -0,0 +1,3 @@ +menuentry "Memory Diagnostic Tool (@MEMTEST_VERSION@)" --hotkey=m { + linux16 @MEMTEST_BIN@ +} |