diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2014-09-03 14:30:21 (EDT) |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2014-09-03 14:30:21 (EDT) |
commit | 96ca7ee67a36605a33de8d57eb8e8d3998bc6427 (patch) | |
tree | 07202c5fe7d366f50d9d17010f3bbf0a44c08ee8 /resources/grub/config/x60t/grub_usqwerty.cfg | |
parent | 4e8051dfaa0ba5617961481056eb7e79d7b50861 (diff) | |
parent | 9a321884379a71b5f0986fdfb97a2b6c5bdccd8a (diff) | |
download | libreboot-96ca7ee67a36605a33de8d57eb8e8d3998bc6427.zip libreboot-96ca7ee67a36605a33de8d57eb8e8d3998bc6427.tar.gz libreboot-96ca7ee67a36605a33de8d57eb8e8d3998bc6427.tar.bz2 |
Merge libreboot-6b6.
Conflicts:
buildrom-withgrub
Diffstat (limited to 'resources/grub/config/x60t/grub_usqwerty.cfg')
-rw-r--r-- | resources/grub/config/x60t/grub_usqwerty.cfg | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/resources/grub/config/x60t/grub_usqwerty.cfg b/resources/grub/config/x60t/grub_usqwerty.cfg deleted file mode 100644 index cce7a44..0000000 --- a/resources/grub/config/x60t/grub_usqwerty.cfg +++ /dev/null @@ -1,56 +0,0 @@ -# -# GRUB configuration file which sits inside the root CBFS (coreboot filesystem) -# -# Copyright (C) 2014 Francis Rowe -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# - -set default="0" -set timeout=1 -set pager=1 - -background_image (cbfsdisk)/background.jpg -loadfont (cbfsdisk)/dejavusansmono.pf2 - -menuentry 'Load Operating System' { - linux (ahci0,1)/vmlinuz root=/dev/sda1 - initrd (ahci0,1)/initrd.img -} -menuentry 'Parse ISOLINUX menu (USB)' { - set root='usb0' - syslinux_configfile -i (usb0)/isolinux/isolinux.cfg -} -menuentry 'Search for GRUB configuration on internal storage' { - insmod regexp - insmod ahci - insmod part_msdos - for x in (ahci0,*) ; do - if [ -f "$x/grub/grub.cfg" ] ; then - submenu "Load Config from $x" $x { - root=$2 - source /grub/grub.cfg - unset superusers - } - fi - if [ -f "$x/boot/grub/grub.cfg" ] ; then - submenu "Load Config from $x" $x { - root=$2 - source /boot/grub/grub.cfg - unset superusers - } - fi - done -} - |