From 83ec4f9a21f819a03c16776b96d5682ac730f2d5 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Wed, 18 Dec 2024 22:13:19 +0100
Subject: [PATCH] build-driver: ship ipxe + memtest86+; grml-live: fix
 NO_ADDONS autodetection

On arm64 we ended up with the following addon behavior:

  [*] Installing boot addons.
  [x] Missing addon file: "ipxe.lkrn"
  [x] Missing addon file: "ipxe.efi"
  [x] Missing addon file: "memtest86+.bin"
  [x] Missing addon file: bsd4grml

And on amd64 we  ended up with the following addon behavior:

  [*] Installing boot addons.
  [x] Missing addon file: "ipxe.lkrn"
  [x] Missing addon file: "ipxe.efi"
  [x] Missing addon file: "memtest86+x64.efi"
  [x] Missing addon file: "memtest86+x64.bin"
  [x] Missing addon file: "memtest86+.bin"
  [x] Missing addon file: bsd4grml

Now by not using the NO_ADDONS autodetection and shipping ipxe on amd64
+ arm64 and memtest86+ on amd64 only (it's not available for arm64), we
get the expected behavior, as in:

On arm64:

  [*] Installing boot addons.
  [x] Missing addon file: "memtest86+.bin"
  [x] Missing addon file: bsd4grml

On amd64:

  [*] Installing boot addons.
  [x] Missing addon file: bsd4grml

Fixes commit a2a16ec495ced3e10086eedd397b45b99b21c31b
Related to https://github.com/grml/grml-live/issues/161
and https://github.com/grml/grml-live/issues/128
---
 build-driver/build.py | 2 ++
 grml-live             | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build-driver/build.py b/build-driver/build.py
index 6003787f..6cf72599 100755
--- a/build-driver/build.py
+++ b/build-driver/build.py
@@ -315,8 +315,10 @@ def install_debian_dependencies():
             debootstrap ,
             dosfstools ,
             fai-client (>= 3.4.0) ,
+            ipxe ,
             isolinux (>= 3:6.03+dfsg-5+deb8u1~) ,
             jo ,
+            memtest86+ [amd64] ,
             mksh ,
             mmdebstrap ,
             moreutils ,
diff --git a/grml-live b/grml-live
index 76c9a3ed..16f4a48f 100755
--- a/grml-live
+++ b/grml-live
@@ -524,8 +524,7 @@ fi
 
 # Automatically enable NO_ADDONS=1 if addons are not present {{{
 if [ -z "${NO_ADDONS:-}" ] && [ ! -r "$TEMPLATE_DIRECTORY"/boot/addons ] ; then
-  ewarn "Boot addons not found, setting NO_ADDONS=1. (Consider installing package grml-live-addons)" ; eend 0
-  NO_ADDONS=1
+  ewarn "Boot addons not found, (Consider installing package grml-live-addons)" ; eend 0
 fi
 # }}}