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 /share | |
| 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
Diffstat (limited to 'share')
| -rw-r--r-- | share/bootloaders/grub-pc/grub.cfg | 6 | ||||
| -rw-r--r-- | share/bootloaders/grub-pc/memtest.cfg | 3 |
2 files changed, 7 insertions, 2 deletions
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@ +} |