aboutsummaryrefslogtreecommitdiff
path: root/projects/grub
diff options
context:
space:
mode:
authorAndrew Robbins <contact@andrewrobbins.info>2017-07-31 00:31:01 -0400
committerAndrew Robbins <contact@andrewrobbins.info>2017-07-31 17:10:34 -0400
commitdf551a9b84016b9cf0f77d9a59999d055ee0885a (patch)
tree92dff33fa87059610ab9a2c9b2e7416f2f70bd0b /projects/grub
parent795cbd0fc51691277f8ec803d2d7895c52cd15dd (diff)
downloadlibrebootfr-df551a9b84016b9cf0f77d9a59999d055ee0885a.tar.gz
librebootfr-df551a9b84016b9cf0f77d9a59999d055ee0885a.zip
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+.
Diffstat (limited to 'projects/grub')
-rw-r--r--projects/grub/install/txtmode/grub.cfg3
-rw-r--r--projects/grub/install/txtmode/grubtest.cfg3
2 files changed, 2 insertions, 4 deletions
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
}