From 95c971e91ed549d968bcd5bbe0fcfe41d87d6af7 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Sun, 24 May 2015 20:15:31 -0400 Subject: GRUB: change background to libreboot logo, with grey background --- diff --git a/grub.cfg b/grub.cfg new file mode 100644 index 0000000..189cdb5 --- /dev/null +++ b/grub.cfg @@ -0,0 +1,148 @@ +set prefix=(memdisk)/boot/grub + +insmod nativedisk +insmod ehci +insmod ohci +insmod uhci +insmod usb +insmod usbserial_pl2303 +insmod usbserial_ftdi +insmod usbserial_usbdebug + +# Serial and keyboard configuration, very important. +serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1 +terminal_input --append serial +terminal_output --append serial +terminal_input --append at_keyboard + +gfxpayload=keep +terminal_output --append gfxterm + +# Default to first option, automatically boot after 1 second +set default="0" +set timeout=1 + +# This is useful when using 'cat' on long files on GRUB terminal +set pager=1 + +# # Play a beep on startup +# play 480 440 1 +insmod jpeg + +background_image (cbfsdisk)/background.png +loadfont (memdisk)/dejavusansmono.pf2 + +keymap ukqwerty +menuentry 'Load Operating System' { + insmod ahci + insmod part_msdos + insmod part_gpt + for x in (ahci0,1) (ahci0,2) (ahci0,3) (ahci0,4); do + if [ -f "$x/grub/libreboot_grub.cfg" ] ; then + set root=$x + configfile /grub/libreboot_grub.cfg + fi + if [ -f "$x/boot/grub/libreboot_grub.cfg" ] ; then + set root=$x + configfile /boot/grub/libreboot_grub.cfg + fi + done + + set root='ahci0,1' + linux /vmlinuz root=/dev/sda1 rw + if [ -f "/initrd.img" ] ; then + initrd /initrd.img + fi +} +menuentry 'Parse ISOLINUX menu (ahci0)' { + insmod ahci + insmod part_msdos + insmod part_gpt + for x in (ahci0,1) (ahci0,2) (ahci0,3) (ahci0,4); do + set root=$x + if [ -f "/isolinux/isolinux.cfg" ] ; then + syslinux_configfile -i /isolinux/isolinux.cfg + elif [ -f "/syslinux/syslinux.cfg" ] ; then + syslinux_configfile -i /syslinux/syslinux.cfg + elif [ -f "/boot/isolinux/isolinux.cfg" ] ; then + syslinux_configfile -i /boot/isolinux/isolinux.cfg + elif [ -f "/boot/syslinux/syslinux.cfg" ] ; then + syslinux_configfile -i /boot/syslinux/syslinux.cfg + fi + done +} +menuentry 'Parse ISOLINUX menu (USB)' { + insmod usbms + insmod part_msdos + insmod part_gpt + for x in (usb0) (usb0,1) (usb0,2) (usb0,3) (usb0,4); do + set root=$x + if [ -f "/isolinux/isolinux.cfg" ] ; then + syslinux_configfile -i /isolinux/isolinux.cfg + elif [ -f "/syslinux/syslinux.cfg" ] ; then + syslinux_configfile -i /syslinux/syslinux.cfg + elif [ -f "/boot/isolinux/isolinux.cfg" ] ; then + syslinux_configfile -i /boot/isolinux/isolinux.cfg + elif [ -f "/boot/syslinux/syslinux.cfg" ] ; then + syslinux_configfile -i /boot/syslinux/syslinux.cfg + fi + done +} +menuentry 'Parse ISOLINUX menu (CD/DVD)' { + insmod ahci + insmod ata + insmod iso9660 + for x in (ata0) (ahci1); do + set root=$x + if [ -f "/isolinux/isolinux.cfg" ] ; then + syslinux_configfile -i /isolinux/isolinux.cfg + elif [ -f "/syslinux/syslinux.cfg" ] ; then + syslinux_configfile -i /syslinux/syslinux.cfg + elif [ -f "/boot/isolinux/isolinux.cfg" ] ; then + syslinux_configfile -i /boot/isolinux/isolinux.cfg + elif [ -f "/boot/syslinux/syslinux.cfg" ] ; then + syslinux_configfile -i /boot/syslinux/syslinux.cfg + fi + done +} +menuentry 'Switch to grubtest.cfg' { + set root='cbfsdisk' + configfile (cbfsdisk)/grubtest.cfg +} +menuentry 'Search for GRUB configuration (grub.cfg) outside of CBFS' { + insmod ahci + insmod usbms + insmod part_msdos + insmod part_gpt + for x in (ahci0,1) (ahci0,2) (ahci0,3) (ahci0,4) (usb0) (usb0,1) (usb0,2) (usb0,3) (usb0,4); 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 + if [ -f "$x/grub2/grub.cfg" ] ; then + submenu "Load Config from $x" $x { + root=$2 + source /grub2/grub.cfg + unset superusers + } + fi + if [ -f "$x/boot/grub2/grub.cfg" ] ; then + submenu "Load Config from $x" $x { + root=$2 + source /boot/grub2/grub.cfg + unset superusers + } + fi + done +} + diff --git a/resources/grub/background/COPYING b/resources/grub/background/COPYING index b916766..cb520e1 100644 --- a/resources/grub/background/COPYING +++ b/resources/grub/background/COPYING @@ -1,7 +1,3 @@ -background.jpg is based on https://www.gnu.org/graphics/meditate.xcf.gz -which can be found at https://www.gnu.org/graphics/meditate.html -Check that webpage for licensing information to see what conditions the image falls under. - -gnulove.jpg based on the image found at https://www.gnu.org/graphics/gnulove.html - -Look at those pages to see what copyright license they fall under. +These images are based on http://libreboot.org/logo/logo.svg +which is Copyright 2014 Marcus Moeller and released under CC-0 +https://creativecommons.org/publicdomain/zero/1.0/legalcode \ No newline at end of file diff --git a/resources/grub/background/background.jpg b/resources/grub/background/background.jpg deleted file mode 100644 index 0244adf..0000000 --- a/resources/grub/background/background.jpg +++ /dev/null Binary files differ diff --git a/resources/grub/background/background1024x768.png b/resources/grub/background/background1024x768.png new file mode 100644 index 0000000..cd726be --- /dev/null +++ b/resources/grub/background/background1024x768.png Binary files differ diff --git a/resources/grub/background/background1280x800.png b/resources/grub/background/background1280x800.png new file mode 100644 index 0000000..96d28b1 --- /dev/null +++ b/resources/grub/background/background1280x800.png Binary files differ diff --git a/resources/grub/background/gnulove.jpg b/resources/grub/background/gnulove.jpg deleted file mode 100644 index 6358271..0000000 --- a/resources/grub/background/gnulove.jpg +++ /dev/null Binary files differ diff --git a/resources/grub/background/logo.svg b/resources/grub/background/logo.svg new file mode 100644 index 0000000..62147c1 --- /dev/null +++ b/resources/grub/background/logo.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/resources/grub/config/extra/vesafb.cfg b/resources/grub/config/extra/vesafb.cfg index 6eaedf7..6831686 100644 --- a/resources/grub/config/extra/vesafb.cfg +++ b/resources/grub/config/extra/vesafb.cfg @@ -1,5 +1,5 @@ insmod jpeg -background_image (cbfsdisk)/background.jpg +background_image (cbfsdisk)/background.png loadfont (memdisk)/dejavusansmono.pf2 diff --git a/resources/scripts/helpers/build/roms/helper b/resources/scripts/helpers/build/roms/helper index 5fcd4c0..aa2dcc7 100755 --- a/resources/scripts/helpers/build/roms/helper +++ b/resources/scripts/helpers/build/roms/helper @@ -84,9 +84,9 @@ do then if [ "$1" = "macbook21" ] || [ "$1" = "x200_4mb" ] || [ "$1" = "x200_8mb" ] || [ "$1" = "r400_4mb" ] || [ "$1" = "r400_8mb" ] || [ "$1" = "t400_4mb" ] || [ "$1" = "t400_8mb" ] || [ "$1" = "t500_4mb" ] || [ "$1" = "t500_8mb" ] then - ./util/cbfstool/cbfstool "$1"_"$romtype".rom add -f ../resources/grub/background/gnulove.jpg -n background.jpg -t raw + ./util/cbfstool/cbfstool "$1"_"$romtype".rom add -f ../resources/grub/background/background1280x800.png -n background.png -t raw else - ./util/cbfstool/cbfstool "$1"_"$romtype".rom add -f ../resources/grub/background/background.jpg -n background.jpg -t raw + ./util/cbfstool/cbfstool "$1"_"$romtype".rom add -f ../resources/grub/background/background1024x768.png -n background.png -t raw fi fi -- cgit v0.9.1