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/menuentries | |
parent | 4e8051dfaa0ba5617961481056eb7e79d7b50861 (diff) | |
parent | 9a321884379a71b5f0986fdfb97a2b6c5bdccd8a (diff) | |
download | libreboot-96ca7ee67a36605a33de8d57eb8e8d3998bc6427.zip libreboot-96ca7ee67a36605a33de8d57eb8e8d3998bc6427.tar.gz libreboot-96ca7ee67a36605a33de8d57eb8e8d3998bc6427.tar.bz2 |
Merge libreboot-6b6.r20140903
Conflicts:
buildrom-withgrub
Diffstat (limited to 'resources/grub/config/menuentries')
-rw-r--r-- | resources/grub/config/menuentries/common.cfg | 43 | ||||
-rw-r--r-- | resources/grub/config/menuentries/txtmode.cfg | 9 | ||||
-rw-r--r-- | resources/grub/config/menuentries/vesafb.cfg | 0 |
3 files changed, 52 insertions, 0 deletions
diff --git a/resources/grub/config/menuentries/common.cfg b/resources/grub/config/menuentries/common.cfg new file mode 100644 index 0000000..ec476fd --- /dev/null +++ b/resources/grub/config/menuentries/common.cfg @@ -0,0 +1,43 @@ +menuentry 'Load Operating System' { + set root='ahci0,msdos1' + linux /vmlinuz root=/dev/sda1 + initrd /initrd.img +} +menuentry 'Parse ISOLINUX menu (USB)' { + set root='usb0' + syslinux_configfile -i (usb0)/isolinux/isolinux.cfg +} +menuentry 'Parse ISOLINUX menu (CD)' { + set root='ata0' + syslinux_configfile -i (ata0)/isolinux/isolinux.cfg +} +menuentry 'Load SeaBIOS' { + set root='cbfsdisk' + chainloader /bios.bin.elf +} +menuentry 'Switch to grubtest.cfg' { + set root='cbfsdisk' + configfile (cbfsdisk)/grubtest.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 +} + diff --git a/resources/grub/config/menuentries/txtmode.cfg b/resources/grub/config/menuentries/txtmode.cfg new file mode 100644 index 0000000..087886e --- /dev/null +++ b/resources/grub/config/menuentries/txtmode.cfg @@ -0,0 +1,9 @@ +menuentry 'Load GRUB Invaders' { + set root='cbfsdisk' + chainloader /invaders.exec +} +menuentry 'Load MemTest86+' { + set root='cbfsdisk' + chainloader /memtest +} + diff --git a/resources/grub/config/menuentries/vesafb.cfg b/resources/grub/config/menuentries/vesafb.cfg new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/resources/grub/config/menuentries/vesafb.cfg |