From: Michael Prokop Date: Fri, 11 Mar 2022 15:18:19 +0000 (+0100) Subject: Use grubx64.efi file from grml_chroot, instead of relying on host system X-Git-Tag: v0.40.0~2 X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=581da7443c68c362a7677c905ab5c63eb23c5b73 Use grubx64.efi file from grml_chroot, instead of relying on host system We don't want to depend on the host system, but instead use the grubnetx64.efi.signed or grubnetx64.efi files from the grml_chroot as grubx64.efi for PXE boot. Related to commit 871fc96fc This work was funded by Grml-Forensic. --- diff --git a/grml-live b/grml-live index e524e71..08198bc 100755 --- a/grml-live +++ b/grml-live @@ -1764,12 +1764,12 @@ create_netbootpackage() { ewarn "No shimx64.efi for usage with PXE boot found (shim-signed not present?)" ; eend 0 fi - if [ -r /usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed ] ; then + if [ -r "${CHROOT_OUTPUT}"/usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed ] ; then log "Installing /usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed as grubx64.efi in netboot package" - cp /usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed "${WORKING_DIR}"/grubx64.efi - elif [ -r /usr/lib/grub/x86_64-efi/monolithic/grubnetx64.efi ] ; then + cp "${CHROOT_OUTPUT}"/usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed "${WORKING_DIR}"/grubx64.efi + elif [ -r "${CHROOT_OUTPUT}"/usr/lib/grub/x86_64-efi/monolithic/grubnetx64.efi ] ; then log "Installing /usr/lib/grub/x86_64-efi/monolithic/grubnetx64.efi as grubx64.efi in netboot package" - cp /usr/lib/grub/x86_64-efi/monolithic/grubnetx64.efi "${WORKING_DIR}"/grubx64.efi + cp "${CHROOT_OUTPUT}"/usr/lib/grub/x86_64-efi/monolithic/grubnetx64.efi "${WORKING_DIR}"/grubx64.efi else log "No grubnetx64.efi for usage with PXE boot found (grub-efi-amd64-signed not present?)" ewarn "No grubnetx64.efi for usage with PXE boot found (grub-efi-amd64-signed not present?)." ; eend 0