diff options
| author | Luca Boccassi <bluca@debian.org> | 2018-09-14 16:38:33 +0100 |
|---|---|---|
| committer | Luca Boccassi <bluca@debian.org> | 2018-09-19 11:35:17 +0100 |
| commit | f108fdfa71c9d66a5ef9dfe7f1f48c170c7f228e (patch) | |
| tree | f8c4dcf253e734fea89a5fee41ac96a2d6c463ef | |
| parent | c22f1f5b71745922ae28df0ebf4b7d1a49d89f55 (diff) | |
| download | vyos-live-build-f108fdfa71c9d66a5ef9dfe7f1f48c170c7f228e.tar.gz vyos-live-build-f108fdfa71c9d66a5ef9dfe7f1f48c170c7f228e.zip | |
UEFI: remove the EFI/debian/grub.cfg, not necessary anymore
Turns out gcd works fine after adding /boot/grub/grub.cfg in the img,
as that's the path that gets hardcoded, and adding the EFI/debian/
grub.cfg was not necessary, so remove it.
| -rwxr-xr-x | scripts/build/binary_grub-efi | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/scripts/build/binary_grub-efi b/scripts/build/binary_grub-efi index 5b4e50c08..7afa07eb7 100755 --- a/scripts/build/binary_grub-efi +++ b/scripts/build/binary_grub-efi @@ -181,7 +181,6 @@ gen_efi_boot_img(){ 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/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 \ @@ -189,14 +188,6 @@ gen_efi_boot_img(){ fi } -# The EFI vendor, used by Grub to set the directory in the monolithic image, depends -# on the distro vendor set at Grub's build time. It will be added to the package metadata. -EFI_VENDOR="\$(dpkg-query -f='\${Efi-Vendor}' -W grub-efi-${_SB_EFI_DEB}-bin)" -# If it's missing, fallback to the previous usage of just "debian". -if [ -z "$EFI_VENDOR" ]; then - EFI_VENDOR="debian" -fi - PRE_EFI_IMAGE_PATH="${PATH}" if [ ! -e "${LIVE_BUILD}" ] ; then LIVE_BUILD_PATH="/usr/lib/live/build" @@ -252,14 +243,6 @@ done # directories: EFI EFI/boot boot boot/grub size=\$((\$size + 4096 * 4)) -# EFI/\$EFI_VENDOR and additional grub.cfg -if [ -d "${_CHROOT_DIR}/grub-efi-temp/EFI/\$EFI_VENDOR" ]; then - size=\$((\$size + 4096)) - size=\$((\$size + \$(stat -c %s "${_CHROOT_DIR}/grub-efi-temp-cfg/grub.cfg"))) - cp ${_CHROOT_DIR}/grub-efi-temp-cfg/grub.cfg \ - "${_CHROOT_DIR}/grub-efi-temp/EFI/\$EFI_VENDOR" -fi - blocks=\$(((\$size / 1024 + 55) / 32 * 32 )) rm -f ${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img @@ -269,12 +252,6 @@ mmd -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ::EFI/boot mcopy -o -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ${_CHROOT_DIR}/grub-efi-temp/EFI/boot/*.efi \ "::EFI/boot" -if [ -d "${_CHROOT_DIR}/grub-efi-temp/EFI/\$EFI_VENDOR" ]; then - mmd -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" "::EFI/\$EFI_VENDOR" - mcopy -o -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" \ - ${_CHROOT_DIR}/grub-efi-temp-cfg/grub.cfg "::EFI/\$EFI_VENDOR" -fi - mmd -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ::boot mmd -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ::boot/grub mcopy -o -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ${_CHROOT_DIR}/grub-efi-temp-cfg/grub.cfg \ |