Merge pull request grml#307 from grml/ipxe

signed-log · Feb 8, 2025 · 120c44d · 120c44d
2 parents f7fd0f6 + 48e5c53
commit 120c44d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/config/package_config/GRML_FULL b/config/package_config/GRML_FULL
@@ -165,6 +165,7 @@ iptstate
 iputils-arping
 iputils-ping
 iputils-tracepath
+ipxe
 iw
 libnss-mdns
 libteam-utils

diff --git a/grml-live b/grml-live
@@ -1045,8 +1045,14 @@ else
     einfo "Installing boot addons."
 
     # copy from chroot-installed packages
-    copy_file_logged "${BUILD_OUTPUT}"/boot/addons/ipxe.lkrn "${CHROOT_OUTPUT}" /usr/lib/ipxe/ipxe.lkrn
-    copy_file_logged "${BUILD_OUTPUT}"/boot/addons/ipxe.efi "${CHROOT_OUTPUT}" /usr/lib/ipxe/ipxe.efi
+
+    # ipxe >= 1.21.1+git20220113.fbbdc3926+dfsg-3
+    if [[ "$ARCH" == "amd64" ]] ; then
+      copy_file_logged "${BUILD_OUTPUT}"/boot/addons/ipxe.lkrn "${CHROOT_OUTPUT}" /usr/lib/ipxe/ipxe.lkrn
+      copy_file_logged "${BUILD_OUTPUT}"/boot/addons/ipxe.efi "${CHROOT_OUTPUT}" /usr/lib/ipxe/ipxe-amd64.efi
+    elif [[ "$ARCH" == "arm64" ]] ; then
+      copy_file_logged "${BUILD_OUTPUT}"/boot/addons/ipxe.efi "${CHROOT_OUTPUT}" /usr/lib/ipxe/ipxe-arm64.efi
+    fi
 
     # memtest86+ >=6.00-1
     if [[ "$ARCH" == "amd64" ]] ; then