summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKlemens Nanni <contact@autoboot.org>2015-11-05 14:35:59 (EST)
committer Francis Rowe <info@gluglug.org.uk>2015-11-05 16:31:00 (EST)
commit6ad0da705d8201782fdbbc482c8eaafa5af1923a (patch)
treeb5befc54cd09f9bdd2e7cd3e6d57cdfd58316c5e
parentec162e45ee82503306b66c5e19cd9946ded5668f (diff)
downloadlibreboot-6ad0da705d8201782fdbbc482c8eaafa5af1923a.zip
libreboot-6ad0da705d8201782fdbbc482c8eaafa5af1923a.tar.gz
libreboot-6ad0da705d8201782fdbbc482c8eaafa5af1923a.tar.bz2
grub.cfg: Add MemTest86+ hotkey, fix lowercase
Appearently --hotkey can only be used once, therefore remove uppercase Letters overwriting lowercase ones.
-rw-r--r--resources/grub/config/menuentries/common.cfg16
-rw-r--r--resources/grub/config/menuentries/txtmode.cfg2
2 files changed, 9 insertions, 9 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg
index 4cebb39..81af916 100644
--- a/resources/grub/config/menuentries/common.cfg
+++ b/resources/grub/config/menuentries/common.cfg
@@ -1,4 +1,4 @@
-menuentry 'Load Operating System (incl. fully encrypted disks) [O]' --hotkey='o' --hotkey='O' {
+menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o' {
# GRUB handles (almost) every possible disk setup, but only the location of /boot is actually important,
# since GRUB only loads the user's config. As soon as the kernel takes over, libreboot's done.
@@ -67,7 +67,7 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [O]' --hotkey='o
fi
done
}
-menuentry 'Parse ISOLINUX menu (AHCI) [A]' --hotkey='a' --hotkey='A' {
+menuentry 'Parse ISOLINUX menu (AHCI) [a]' --hotkey='a' {
for i in 0 1; do
# Check for filesystem on raw device without partition table (MBR/GPT), e.g. BTRFS or ZFS
set root=ahci${i}
@@ -92,7 +92,7 @@ menuentry 'Parse ISOLINUX menu (AHCI) [A]' --hotkey='a' --hotkey='A' {
done
done
}
-menuentry 'Parse ISOLINUX menu (USB) [U]' --hotkey='u' --hotkey='U' {
+menuentry 'Parse ISOLINUX menu (USB) [u]' --hotkey='u' {
for i in 0 1; do
# Check for filesystem on raw device without partition table (MBR/GPT), e.g. BTRFS or ZFS
set root=usb${i}
@@ -117,7 +117,7 @@ menuentry 'Parse ISOLINUX menu (USB) [U]' --hotkey='u' --hotkey='U' {
done
done
}
-menuentry 'Parse ISOLINUX menu (CD/DVD) [D]' --hotkey='d' --hotkey='D' {
+menuentry 'Parse ISOLINUX menu (CD/DVD) [d]' --hotkey='d' {
insmod ata
for x in ata0 ahci1; do
set root=${x}
@@ -130,11 +130,11 @@ menuentry 'Parse ISOLINUX menu (CD/DVD) [D]' --hotkey='d' --hotkey='D' {
done
done
}
-menuentry 'Switch to grubtest.cfg [T]' --hotkey='t' --hotkey='T' {
+menuentry 'Switch to grubtest.cfg [t]' --hotkey='t' {
set root=cbfsdisk
configfile /grubtest.cfg
}
-menuentry 'Search for GRUB configuration (grub.cfg) outside of CBFS [S]' --hotkey='s' --hotkey='S' {
+menuentry 'Search for GRUB configuration (grub.cfg) outside of CBFS [s]' --hotkey='s' {
for i in usb0 usb1 ahci0 ahci1; do
for j in 1 2 3 4 5 6 7 8 9; do
x=${i},${j}
@@ -150,10 +150,10 @@ menuentry 'Search for GRUB configuration (grub.cfg) outside of CBFS [S]' --hotk
done
done
}
-menuentry 'Poweroff [P]' --hotkey='p' --hotkey='P' {
+menuentry 'Poweroff [p]' --hotkey='p' {
halt
}
-menuentry 'Reboot [R]' --hotkey='r' --hotkey='R' {
+menuentry 'Reboot [r]' --hotkey='r' {
reboot
}
menuentry 'Load SeaBIOS' {
diff --git a/resources/grub/config/menuentries/txtmode.cfg b/resources/grub/config/menuentries/txtmode.cfg
index 65416e0..b395868 100644
--- a/resources/grub/config/menuentries/txtmode.cfg
+++ b/resources/grub/config/menuentries/txtmode.cfg
@@ -1,4 +1,4 @@
-menuentry 'Load MemTest86+' {
+menuentry 'Load MemTest86+ [m]' --hotkey='m' {
set root='memdisk'
linux16 /memtest.bin
}