libreboot

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs | README

commit 542c3b3980e6b6f0b2277b8b04d41a09dfe45f73
parent a39e105a4e612727a9e9b98dc805e750011d8f4f
Author: Leah Rowe <info@minifree.org>
Date:   Sat, 14 Apr 2018 14:46:02 +0000

Merge branch 'grub-scripts' of and_who/libreboot into master

Diffstat:
projects/grub/configs/bios/modules-minimal | 6++++++
projects/grub/configs/coreboot/modules-minimal | 3+++
projects/grub/configs/uefi/modules-minimal | 3+++
projects/grub/grub-helper | 12+++++++++---
4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/projects/grub/configs/bios/modules-minimal b/projects/grub/configs/bios/modules-minimal @@ -1,8 +1,14 @@ +ahci biosdisk +cbfs cbmemc +configfile +ehci ext2 halt +loadenv part_bsd part_gpt +pata reboot verify diff --git a/projects/grub/configs/coreboot/modules-minimal b/projects/grub/configs/coreboot/modules-minimal @@ -1,8 +1,11 @@ ahci +cbfs cbmemc +configfile ehci ext2 halt +loadenv part_bsd part_gpt pata diff --git a/projects/grub/configs/uefi/modules-minimal b/projects/grub/configs/uefi/modules-minimal @@ -1,8 +1,11 @@ ahci +cbfs cbmemc +configfile ehci ext2 halt +loadenv part_bsd part_gpt pata diff --git a/projects/grub/grub-helper b/projects/grub/grub-helper @@ -128,6 +128,9 @@ grub_build_bootable_image() { local format="$(grub_format "$target" "$@")" local prefix="$(grub_prefix "$target" "$@")" local config_path="$(grub_config_path "$target" "$@")" + local modmin_path="$(grub_modmin_path "$target" "$@")" + + local -a modmin=($(< "$modmin_path")) local grub_mkimage="$sources_path/grub-mkimage" local grub_module_dir="$sources_path/grub-core" @@ -142,7 +145,7 @@ grub_build_bootable_image() { --output="$grubimg" \ --format="$format" \ --prefix="$prefix" \ - cbfs configfile + "${modmin[@]}" cat "$grub_bootimg" "$grubimg" > "$grub_bootable_img" rm -f "$grubimg" @@ -181,7 +184,7 @@ grub_build_floppy_image() { mv "$tempfile" "$grubimg" else printf '\n%s' "Error: Image ${grubimg##*/} is too large; " 1>&2 - printf '%s\n\n' "it must be less than ${size}KiB in size" 1>&2 + printf '%s\n\n' "it must be less than ${floppy_size}KiB in size" 1>&2 return 1 fi @@ -192,6 +195,9 @@ grub_build_standalone_image() { local format="$(grub_format "$target" "$@")" local prefix="$(grub_prefix "$target" "$@")" local config_path="$(grub_config_path "$target" "$@")" + local modmin_path="$(grub_modmin_path "$target" "$@")" + + local -a modmin=($(< "$modmin_path")) local grubimg="$build_path/grub2" @@ -204,7 +210,7 @@ grub_build_standalone_image() { --fonts='' \ --themes='' \ --locales='' \ - --install-modules='cbfs configfile' \ + --install-modules="${modmin[*]}" \ --directory="$grub_module_dir" \ --format="$format" \ --output="$grubimg" \