summaryrefslogtreecommitdiffstats
path: root/resources/grub
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2014-08-11 09:00:00 (EDT)
committer Michał Masłowski <mtjm@mtjm.eu>2014-08-22 14:29:49 (EDT)
commit8df313c4d6607181576471e08d7e909c9c0f33e9 (patch)
tree249f6003e3293fd4049ad57c267fa7ec1c4269e4 /resources/grub
parent7eca665d684a734d55b0bb26c4f1831d399c5330 (diff)
downloadlibreboot-8df313c4d6607181576471e08d7e909c9c0f33e9.zip
libreboot-8df313c4d6607181576471e08d7e909c9c0f33e9.tar.gz
libreboot-8df313c4d6607181576471e08d7e909c9c0f33e9.tar.bz2
Libreboot release 6 beta 5.
- build: added 'luks', 'lvm', 'cmosdump' and 'cmostest' to the list of modules for grub.elf - Documentation: added pics showing T60 unbricking (still need to write a tutorial) - build: include cmos.layout (coreboot/src/mainboard/manufacturer/model/cmos.layout) files in libreboot_bin - Documentation: added ../docs/howtos/x60tablet_unbrick.html - Documentation: added ../docs/howtos/t60_unbrick.html - Documentation: added ../docs/howtos/t60_lcd_15.html - Documentation: added ../docs/howtos/t60_security.html - Documentation: added ../docs/howtos/t60_heatsink.html - Documentation: Renamed RELEASE.html to release.html - Documentation: removed pcmcia reference in x60_security.html (it's cardbus) - Documentation: added preliminary information about randomized seal (for physical intrusion detection) in x60_security.html and t60_security.html - Documentation: added preliminary information about preventing/mitigating cold-boot attack in x60_security.html and t60_security.html - Documentation: added info to ../docs/index.html#macbook21 warning about issues with macbook21 - Documentation: X60/T60: added information about checking custom ROM's using dd to see whether or not the top 64K region is duplicated below top or not. Advise caution about this in the tutorial that deals with flashing on top of Lenovo BIOS, citing the correct dd commands necessary if it is confirmed that the ROM has not been applied with dd yet. (in the case that the user compiled their own ROM's from libreboot, without using the build scripts, or if they forgot to use dd, etc). - Split resources/libreboot/patch/gitdiff into separate patch files (getcb script updated to accomodate this change). - Re-added .git files to bucts - Fixed the oversight where macbook21_firstflash wasn't included in binary archives
Diffstat (limited to 'resources/grub')
-rw-r--r--resources/grub/config/x60/grub_usqwerty.cfg6
1 files changed, 4 insertions, 2 deletions
diff --git a/resources/grub/config/x60/grub_usqwerty.cfg b/resources/grub/config/x60/grub_usqwerty.cfg
index cce7a44..414d2d2 100644
--- a/resources/grub/config/x60/grub_usqwerty.cfg
+++ b/resources/grub/config/x60/grub_usqwerty.cfg
@@ -24,9 +24,11 @@ set pager=1
background_image (cbfsdisk)/background.jpg
loadfont (cbfsdisk)/dejavusansmono.pf2
+keymap ukqwerty
+
menuentry 'Load Operating System' {
- linux (ahci0,1)/vmlinuz root=/dev/sda1
- initrd (ahci0,1)/initrd.img
+ 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
}
menuentry 'Parse ISOLINUX menu (USB)' {
set root='usb0'