diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-04-01 10:58:47 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2020-04-23 15:54:19 +0200 |
| commit | 6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4 (patch) | |
| tree | c91a79037457e7bb2c0630fa8c065bee6c465bad /scripts/build/binary_grub-efi | |
| parent | 6def2c27be28169cf3e0757a6928e3f13de157a8 (diff) | |
| download | vyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.tar.gz vyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.zip | |
rename LB_ARCHITECTURES to LB_ARCHITECTURE
this was previously not done in 8b109ffb96282a6dd1aa5d61aa935bcba69c56f1
to keep the renaming simple, but leaving the variable plural is a cause
for confusion.
since this property is stored in the INI style config/build config file
rather than a shell script based one, at the property there is already
singular, there was no need for a backwards compatibility hack.
Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_grub-efi')
| -rwxr-xr-x | scripts/build/binary_grub-efi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/binary_grub-efi b/scripts/build/binary_grub-efi index d1a9ff91d..d94f8bfd3 100755 --- a/scripts/build/binary_grub-efi +++ b/scripts/build/binary_grub-efi @@ -43,7 +43,7 @@ Check_architectures amd64 i386 arm64 armhf Check_crossarchitectures # Checking depends -case "${LB_ARCHITECTURES}" in +case "${LB_ARCHITECTURE}" in amd64|i386) Check_package chroot /usr/lib/grub/x86_64-efi/configfile.mod grub-efi-amd64-bin Check_package chroot /usr/lib/grub/i386-efi/configfile.mod grub-efi-ia32-bin @@ -62,7 +62,7 @@ Check_package chroot /sbin/mkfs.msdos dosfstools # Check UEFI Secure Boot setting and depends # By default (auto) do a best-effort build: if the signed binaries are available use # them, but don't fail if they are not, just print a warning. -case "${LB_ARCHITECTURES}" in +case "${LB_ARCHITECTURE}" in amd64|i386) _SB_EFI_PLATFORM="x86_64" _SB_EFI_NAME="x64" @@ -195,7 +195,7 @@ fi PATH="${PATH}:\${LIVE_BUILD_PATH}" # Make sure grub-cpmodules is used as if it was installed in the system -case "${LB_ARCHITECTURES}" in +case "${LB_ARCHITECTURE}" in amd64|i386) gen_efi_boot_img "x86_64-efi" "x64" "debian-live/amd64" gen_efi_boot_img "i386-efi" "ia32" "debian-live/i386" |