From df551a9b84016b9cf0f77d9a59999d055ee0885a Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Mon, 31 Jul 2017 00:31:01 -0400 Subject: Load MemTest86+ from cbfsdisk instead of memdisk This makes generating grub.elf more straightforward by not having to make separate ELF files for txtmode and vesafb just because of MemTest86+. --- projects/grub/install/txtmode/grub.cfg | 3 +-- projects/grub/install/txtmode/grubtest.cfg | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'projects/grub') diff --git a/projects/grub/install/txtmode/grub.cfg b/projects/grub/install/txtmode/grub.cfg index 329be946..17c09e63 100644 --- a/projects/grub/install/txtmode/grub.cfg +++ b/projects/grub/install/txtmode/grub.cfg @@ -172,6 +172,5 @@ menuentry 'Reboot [r]' --hotkey='r' { } menuentry 'Load MemTest86+ [m]' --hotkey='m' { - set root='memdisk' - linux16 /memtest.bin + linux16 (cbfsdisk)/memtest.bin } diff --git a/projects/grub/install/txtmode/grubtest.cfg b/projects/grub/install/txtmode/grubtest.cfg index db12a1d8..c957dd49 100644 --- a/projects/grub/install/txtmode/grubtest.cfg +++ b/projects/grub/install/txtmode/grubtest.cfg @@ -172,6 +172,5 @@ menuentry 'Reboot [r]' --hotkey='r' { } menuentry 'Load MemTest86+ [m]' --hotkey='m' { - set root='memdisk' - linux16 /memtest.bin + linux16 (cbfsdisk)/memtest.bin } -- cgit v1.2.3-70-g09d2