aboutsummaryrefslogtreecommitdiff
path: root/projects/grub/grub-helper
diff options
context:
space:
mode:
authorAndrew Robbins <contact@andrewrobbins.info>2018-03-11 22:48:17 -0400
committerAndrew Robbins <contact@andrewrobbins.info>2018-04-07 22:31:45 -0400
commit6519ab6ddccf6804efb16548bef4e47ece735015 (patch)
tree46dbd823dedef9f68abb005b539394c9b4eddd76 /projects/grub/grub-helper
parent4701bb7731d747bd4d6e293ed58adaea2b3c16c8 (diff)
downloadlibrebootfr-6519ab6ddccf6804efb16548bef4e47ece735015.tar.gz
librebootfr-6519ab6ddccf6804efb16548bef4e47ece735015.zip
Include modules from modules-minimal in GRUB image
Diffstat (limited to 'projects/grub/grub-helper')
-rwxr-xr-xprojects/grub/grub-helper10
1 files changed, 8 insertions, 2 deletions
diff --git a/projects/grub/grub-helper b/projects/grub/grub-helper
index dd069290..0ffa8e27 100755
--- 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"
@@ -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" \