diff options
| author | Steven Shiau <steven@nchc.org.tw> | 2018-08-22 11:43:40 +0800 |
|---|---|---|
| committer | Luca Boccassi <bluca@debian.org> | 2018-09-19 11:34:22 +0100 |
| commit | c22f1f5b71745922ae28df0ebf4b7d1a49d89f55 (patch) | |
| tree | 357465df3297d2df7fbdddb36c2e3b0f01f49406 | |
| parent | 8403487d4e3bda65cdd2ea6081399f7977325adb (diff) | |
| download | vyos-live-build-c22f1f5b71745922ae28df0ebf4b7d1a49d89f55.tar.gz vyos-live-build-c22f1f5b71745922ae28df0ebf4b7d1a49d89f55.zip | |
Use gcd{x64.aa64}.efi.signed for amd64/arm64 arch.
For secured boot in binary_grub-efi, the gcdx64.efi.signed is
the boot loader for removable device, like CD or USB flash drive,
while grubx64.efi.signed is for hard drive. Therefore for live system,
use gcdx64.efi.signed for amd64 and gcdaa64.efi.signed for arm64.
| -rwxr-xr-x | scripts/build/binary_grub-efi | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/scripts/build/binary_grub-efi b/scripts/build/binary_grub-efi index 946e38e70..5b4e50c08 100755 --- a/scripts/build/binary_grub-efi +++ b/scripts/build/binary_grub-efi @@ -82,7 +82,7 @@ case "${LB_UEFI_SECURE_BOOT}" in set +e Install_package set -e - Check_installed chroot /usr/lib/grub/${_SB_EFI_PLATFORM}-efi-signed/grub${_SB_EFI_NAME}.efi.signed \ + Check_installed chroot /usr/lib/grub/${_SB_EFI_PLATFORM}-efi-signed/gcd${_SB_EFI_NAME}.efi.signed \ grub-efi-${_SB_EFI_DEB}-signed _GRUB_INSTALL_STATUS="${INSTALL_STATUS}" Check_installed chroot /usr/lib/shim/shim${_SB_EFI_NAME}.efi.signed \ @@ -96,7 +96,7 @@ case "${LB_UEFI_SECURE_BOOT}" in fi ;; enable) - Check_package chroot /usr/lib/grub/${_SB_EFI_PLATFORM}-efi-signed/grub${_SB_EFI_NAME}.efi.signed \ + Check_package chroot /usr/lib/grub/${_SB_EFI_PLATFORM}-efi-signed/gcd${_SB_EFI_NAME}.efi.signed \ grub-efi-${_SB_EFI_DEB}-signed Check_package chroot /usr/lib/shim/shim${_SB_EFI_NAME}.efi.signed \ shim-signed @@ -174,11 +174,15 @@ gen_efi_boot_img(){ # and grub-efi-amd64-signed, currently in Ubuntu: # https://packages.ubuntu.com/xenial/amd64/grub-efi-amd64-signed/filelist # https://packages.ubuntu.com/bionic/arm64/grub-efi-arm64-signed/filelist - if [ -r ${_CHROOT_DIR}/usr/lib/grub/\$platform-signed/grub\$efi_name.efi.signed -a \ + # E.g., gcdx64.efi.signed is the boot loader for removable device, like CD or + # USB flash drive, while grubx64.efi.signed is for hard drive. + # Therefore here gcdx64.efi.signed is used for amd64 and gcdaa64.efi.signed is + # for arm64. + if [ -r ${_CHROOT_DIR}/usr/lib/grub/\$platform-signed/gcd\$efi_name.efi.signed -a \ -r ${_CHROOT_DIR}/usr/lib/shim/shim\$efi_name.efi.signed -a \ "${LB_UEFI_SECURE_BOOT}" != "disable" ]; then mkdir -p "${_CHROOT_DIR}/grub-efi-temp/EFI/\$EFI_VENDOR" - cp ${_CHROOT_DIR}/usr/lib/grub/\$platform-signed/grub\$efi_name.efi.signed \ + cp ${_CHROOT_DIR}/usr/lib/grub/\$platform-signed/gcd\$efi_name.efi.signed \ ${_CHROOT_DIR}/grub-efi-temp/EFI/boot/grub\$efi_name.efi cp ${_CHROOT_DIR}/usr/lib/shim/shim\$efi_name.efi.signed \ ${_CHROOT_DIR}/grub-efi-temp/EFI/boot/boot\$efi_name.efi |