Merge pull request #222 from grml/mika/addons

build-driver: ship ipxe + memtest86+; grml-live: fix NO_ADDONS autodetection
grml · Dec 18, 2024 · 4d9184a · 4d9184a
2 parents 379f167 + 83ec4f9
commit 4d9184a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
 # }}}