summaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2014-08-11 14:55:00 (EDT)
committer Michał Masłowski <mtjm@mtjm.eu>2014-08-22 14:33:23 (EDT)
commitd2ebc60a339b66fe067ebc244ef31c600d57d541 (patch)
treef217c2097e863295c911d2c72a90e4b6308bb586 /resources
parent8df313c4d6607181576471e08d7e909c9c0f33e9 (diff)
downloadlibreboot-d2ebc60a339b66fe067ebc244ef31c600d57d541.zip
libreboot-d2ebc60a339b66fe067ebc244ef31c600d57d541.tar.gz
libreboot-d2ebc60a339b66fe067ebc244ef31c600d57d541.tar.bz2
Libreboot release 6 beta 5 correction 1.
- Fixed typo where revision list for 5th beta was listed as March 11th 2014, when in fact it was August 11th 2014 - Fixed incorrect grub.cfg that was actually placed in resources/grub/config/x60/grub_usqwerty.cfg which broke the default GRUB menu entry on X60
Diffstat (limited to 'resources')
-rw-r--r--resources/grub/config/x60/grub_usqwerty.cfg6
1 files changed, 2 insertions, 4 deletions
diff --git a/resources/grub/config/x60/grub_usqwerty.cfg b/resources/grub/config/x60/grub_usqwerty.cfg
index 414d2d2..cce7a44 100644
--- a/resources/grub/config/x60/grub_usqwerty.cfg
+++ b/resources/grub/config/x60/grub_usqwerty.cfg
@@ -24,11 +24,9 @@ set pager=1
background_image (cbfsdisk)/background.jpg
loadfont (cbfsdisk)/dejavusansmono.pf2
-keymap ukqwerty
-
menuentry 'Load Operating System' {
- linux (ahci0,2)/vmlinuz-linux-lts root=/dev/mapper/v-rootvol rw cryptdevice=/dev/sda3:lvm root=/dev/mapper/v-rootvol
- initrd (ahci0,2)/initramfs-linux-lts.img
+ linux (ahci0,1)/vmlinuz root=/dev/sda1
+ initrd (ahci0,1)/initrd.img
}
menuentry 'Parse ISOLINUX menu (USB)' {
set root='usb0'