summaryrefslogtreecommitdiff
path: root/scripts/build/binary_grub-pc
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-05-04 18:20:02 +0100
committerLyndon Brown <jnqnfe@gmail.com>2020-05-04 22:15:09 +0100
commita542d52141acef0e2d2bb78253d6b5df4305dcd1 (patch)
treed503cb2cdef233f4edba842f55749afb19dbf7ef /scripts/build/binary_grub-pc
parent3a523c3fc12ef23e720020e2bad151fc91b8b35d (diff)
downloadvyos-live-build-a542d52141acef0e2d2bb78253d6b5df4305dcd1.tar.gz
vyos-live-build-a542d52141acef0e2d2bb78253d6b5df4305dcd1.zip
rename binary_loopback_cfg to binary_grub_cfg
when loopback support was introduced, it initially duplicated the code for generating a grub2 config, before the duplicated code was removed from the grub-pc script, effectively thus moving grub config generation to the loopback feature script. grub-efi support was added after this. this results in a misleading filename, since the `binary_loopback_cfg` script is essential for use of grub-pc|grub-efi, and actually only has a single line of code on top that's needed for adding actual loopback support on top. (when grub-pc and grub-efi are not used, the entire script is still needed for loopback support to work). so here we rename it to make better sense, and correct/clarify bits of documentation. Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_grub-pc')
-rwxr-xr-xscripts/build/binary_grub-pc4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/binary_grub-pc b/scripts/build/binary_grub-pc
index f639b1aa1..9fca63272 100755
--- a/scripts/build/binary_grub-pc
+++ b/scripts/build/binary_grub-pc
@@ -31,6 +31,8 @@ fi
Echo_message "Begin installing grub-pc..."
+# NOTE: We rely on `binary_grub_cfg` to generate grub.cfg and other configuration files!
+
# Requiring stage file
Require_stagefiles config bootstrap
@@ -71,8 +73,6 @@ then
FILES="$(echo ${FILES} | sed -e 's|chroot||g')"
fi
-# We rely on: binary_loopback_cfg to generate grub.cfg and other configuration files
-
# Copying grub
cp ${FILES} binary/boot/grub/i386-pc