From 34785ac42ff81a4cacd5961c8fc26933f1058f3b Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 23 Dec 2020 18:25:09 +0100 Subject: [PATCH] netbootpackage: use x86_64-efi-signed files from target instead of host system We try to be as independent from the host system as possible. This work was funded by Grml-Forensic. --- grml-live | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/grml-live b/grml-live index e0d55f4..54250ee 100755 --- a/grml-live +++ b/grml-live @@ -1691,12 +1691,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 - 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 - 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 + if [ -r "${CHROOT_OUTPUT}"/usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed ] ; then + log "Installing ${CHROOT_OUTPUT}/usr/lib/grub/x86_64-efi-signed/grubnetx64.efi.signed as grubx64.efi in netboot package" + 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 ${CHROOT_OUTPUT}/usr/lib/grub/x86_64-efi/monolithic/grubnetx64.efi as grubx64.efi in netboot package" + 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 -- 2.1.4