diff options
author | Andrew Robbins <contact@andrewrobbins.info> | 2017-07-30 03:54:25 -0400 |
---|---|---|
committer | Andrew Robbins <contact@andrewrobbins.info> | 2017-07-31 05:10:52 -0400 |
commit | 866b2b2b3e230baf9ebe1f535dccda512b26644a (patch) | |
tree | ab316bc2dfb2129abc7c1d95ad756bdc4ffbc969 | |
parent | 6d0cb7a80b6c564e272e770783897772e5aeb8b8 (diff) | |
download | librebootfr-866b2b2b3e230baf9ebe1f535dccda512b26644a.tar.gz librebootfr-866b2b2b3e230baf9ebe1f535dccda512b26644a.zip |
Delete leftover unneeded GRUB config files
-rw-r--r-- | projects/grub/configs/config/extra/common.cfg | 28 | ||||
-rw-r--r-- | projects/grub/configs/config/extra/txtmode.cfg | 1 | ||||
-rw-r--r-- | projects/grub/configs/config/extra/vesafb.cfg | 5 | ||||
-rw-r--r-- | projects/grub/configs/config/menuentries/common.cfg | 132 | ||||
-rw-r--r-- | projects/grub/configs/config/menuentries/txtmode.cfg | 4 | ||||
-rw-r--r-- | projects/grub/configs/config/menuentries/vesafb.cfg | 1 |
6 files changed, 0 insertions, 171 deletions
diff --git a/projects/grub/configs/config/extra/common.cfg b/projects/grub/configs/config/extra/common.cfg deleted file mode 100644 index 1d3ddcc7..00000000 --- a/projects/grub/configs/config/extra/common.cfg +++ /dev/null @@ -1,28 +0,0 @@ -set prefix=(memdisk)/boot/grub - -insmod nativedisk -insmod ehci -insmod ohci -insmod uhci -insmod usb -insmod usbms -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 -terminal_output --append cbmemc - -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 diff --git a/projects/grub/configs/config/extra/txtmode.cfg b/projects/grub/configs/config/extra/txtmode.cfg deleted file mode 100644 index 8b137891..00000000 --- a/projects/grub/configs/config/extra/txtmode.cfg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/projects/grub/configs/config/extra/vesafb.cfg b/projects/grub/configs/config/extra/vesafb.cfg deleted file mode 100644 index e1285088..00000000 --- a/projects/grub/configs/config/extra/vesafb.cfg +++ /dev/null @@ -1,5 +0,0 @@ -insmod png - -background_image (cbfsdisk)/background.png -loadfont (memdisk)/dejavusansmono.pf2 - diff --git a/projects/grub/configs/config/menuentries/common.cfg b/projects/grub/configs/config/menuentries/common.cfg deleted file mode 100644 index d65f86fb..00000000 --- a/projects/grub/configs/config/menuentries/common.cfg +++ /dev/null @@ -1,132 +0,0 @@ -function try_user_config { - set root="${1}" - for dir in boot grub grub2 boot/grub boot/grub2; do - for name in libreboot_ autoboot_ librecore_ coreboot_ ''; do - if [ -f /"${dir}"/"${name}"grub.cfg ]; then - unset superusers - configfile /"${dir}"/"${name}"grub.cfg - fi - done - done -} -function search_grub { - for i in 0 1; do - # raw devices - try_user_config "(${1}${i})" - for part in 1 2 3 4 5; do - # MBR/GPT partitions - try_user_config "(${1}${i},${part})" - done - done -} -function try_isolinux_config { - set root="${1}" - for dir in '' /boot; do - if [ -f "${dir}"/isolinux/isolinux.cfg ]; then - syslinux_configfile -i "${dir}"/isolinux/isolinux.cfg - elif [ -f "${dir}"/syslinux/syslinux.cfg ]; then - syslinux_configfile -s "${dir}"/syslinux/syslinux.cfg - fi - done -} -function search_isolinux { - for i in 0 1; do - # raw devices - try_isolinux_config "(${1}${i})" - for part in 1 2 3 4 5; do - # MBR/GPT partitions - try_isolinux_config "(${1}${i},${part})" - done - done -} -menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o' { -# GRUB2 handles (almost) every possible disk setup, but only the location of -# /boot is actually important since GRUB2 only loads the user's config. - -# LVM, RAID, filesystems and encryption on both raw devices and partitions in -# all various combinations need to be supported. Since full disk encryption is -# possible with GRUB2 as payload and probably even used by most users, this -# configuration tries to load the operating system in the following way: - -# 1. Look for user configuration on unencrypted devices first to avoid -# unnecessary decryption routines in the following order: - -# 1) raw devices and MBR/GPT partitions - search_grub ahci - search_grub ata -# 2) LVM and RAID which might be used accross multiple devices - lvm="lvm/matrix-rootvol lvm/matrix-boot" - raid="md/0 md/1 md/2 md/3 md/4 md/5 md/6 md/7 md/8 md/9" - for vol in ${lvm} ${raid}; do - try_user_config "(${vol})" - done -# 2. In case no configuration could be found, try decrypting devices. Look -# on raw crypto devices as well as inside LVM volumes this time. - -# The user will be prompted for a passphrase if a LUKS header was found. - for dev in ahci0 ata0 usb0 ${lvm}; do - cryptomount "(${dev})" - done -# 3) encrypted devices/partitions - for i in 0 1; do - for part in 1 2 3 4 5; do - for type in ahci ata; do - cryptomount "(${type}${i},${part})" - done - done - done - -# 3) encrypted devices/partitions - search_grub crypto -# 4) LVM inside LUKS containers - for vol in ${lvm}; do - try_user_config "(${vol})" - done - - # Last resort, if all else fails - set root=ahci0,1 - for p in / /boot/; do - if [ -f "${p}vmlinuz" ]; then - linux ${p}vmlinuz root=/dev/sda1 rw - if [ -f "${p}initrd.img" ]; then - initrd ${p}initrd.img - fi - fi - done - - # Last resort (for GA-G41-ES2L which uses IDE emulation mode for SATA) - set root=ata0,1 - for p in / /boot/; do - if [ -f "${p}vmlinuz" ]; then - linux ${p}vmlinuz root=/dev/sda1 rw - if [ -f "${p}initrd.img" ]; then - initrd ${p}initrd.img - fi - fi - done -} -menuentry 'Search ISOLINUX menu (AHCI) [a]' --hotkey='a' { - search_isolinux ahci -} -menuentry 'Search ISOLINUX menu (USB) [u]' --hotkey='u' { - search_isolinux usb -} -menuentry 'Search ISOLINUX menu (CD/DVD) [d]' --hotkey='d' { - insmod ata - for dev in ata0 ata1 ata2 ata3 ahci1; do - try_isolinux_config "(${dev})" - done -} -menuentry 'Load test configuration (grubtest.cfg) inside of CBFS [t]' --hotkey='t' { - set root='(cbfsdisk)' - configfile /grubtest.cfg -} -menuentry 'Search for GRUB2 configuration on external media [s]' --hotkey='s' { - search_grub usb -} -menuentry 'Poweroff [p]' --hotkey='p' { - halt -} -menuentry 'Reboot [r]' --hotkey='r' { - reboot -} diff --git a/projects/grub/configs/config/menuentries/txtmode.cfg b/projects/grub/configs/config/menuentries/txtmode.cfg deleted file mode 100644 index 6779fdfb..00000000 --- a/projects/grub/configs/config/menuentries/txtmode.cfg +++ /dev/null @@ -1,4 +0,0 @@ -menuentry 'Load MemTest86+ [m]' --hotkey='m' { - set root='memdisk' - linux16 /memtest.bin -} diff --git a/projects/grub/configs/config/menuentries/vesafb.cfg b/projects/grub/configs/config/menuentries/vesafb.cfg deleted file mode 100644 index 8b137891..00000000 --- a/projects/grub/configs/config/menuentries/vesafb.cfg +++ /dev/null @@ -1 +0,0 @@ - |