From d2ebc60a339b66fe067ebc244ef31c600d57d541 Mon Sep 17 00:00:00 2001
From: Francis Rowe <info@gluglug.org.uk>
Date: Mon, 11 Aug 2014 14:55:00 -0400
Subject: 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
---
(limited to 'resources/grub/config/x60')

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'
--
cgit v0.9.1