summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2015-11-05 14:26:54 (EST)
committer Francis Rowe <info@gluglug.org.uk>2015-11-05 14:26:54 (EST)
commit0fb52ba55c21b6ecbb7bd06b97c78c090e980aad (patch)
treed3372f51b52191e67f2861b6eb96e439e0c2ed8d /resources
parentaca0276b7ddd1622ca26b7d043c6a85486e119ab (diff)
downloadlibreboot-0fb52ba55c21b6ecbb7bd06b97c78c090e980aad.zip
libreboot-0fb52ba55c21b6ecbb7bd06b97c78c090e980aad.tar.gz
libreboot-0fb52ba55c21b6ecbb7bd06b97c78c090e980aad.tar.bz2
grub.cfg: use memtest.bin, not memtest
Diffstat (limited to 'resources')
-rw-r--r--resources/grub/config/menuentries/txtmode.cfg2
-rwxr-xr-xresources/utilities/grub-assemble/gen.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/resources/grub/config/menuentries/txtmode.cfg b/resources/grub/config/menuentries/txtmode.cfg
index 56f4c67..65416e0 100644
--- a/resources/grub/config/menuentries/txtmode.cfg
+++ b/resources/grub/config/menuentries/txtmode.cfg
@@ -1,5 +1,5 @@
menuentry 'Load MemTest86+' {
set root='memdisk'
- linux16 /memtest
+ linux16 /memtest.bin
}
diff --git a/resources/utilities/grub-assemble/gen.sh b/resources/utilities/grub-assemble/gen.sh
index c0b69bb..0182c2e 100755
--- a/resources/utilities/grub-assemble/gen.sh
+++ b/resources/utilities/grub-assemble/gen.sh
@@ -70,7 +70,7 @@ then
--modules="${grub_modules}" \
--install-modules="${grub_install_modules}" \
/boot/grub/grub.cfg="../../../resources/grub/config/grub_memdisk.cfg" \
- /memtest="../../../memtest86plus/memtest.bin" \
+ /memtest.bin="../../../memtest86plus/memtest.bin" \
${keymaps}
else
printf "grub-assemble gen.sh: invalid mode '%s'\n" "${1}"