From 7510fe95545c51f91f7bf6f31177c90e96009d01 Mon Sep 17 00:00:00 2001
From: Michael Prokop <devnull@localhost>
Date: Mon, 29 Sep 2008 13:29:46 +0200
Subject: [PATCH] Support environment variable $NO_ADDONS

---
 debian/changelog |  4 +++-
 grml-live        | 13 +++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50b3c66..a20eaed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,8 +20,10 @@ grml-live (0.9.4) unstable; urgency=low
     - remove nvi (see #490361)
     - remove ppoeconf (just too big with its dependencies)
     - remove prism54-firmware (for saving disk space)
+  * Support environment variable $NO_ADDONS to avoid usage of
+    addons directory.
 
- -- Michael Prokop <mika@grml.org>  Mon, 29 Sep 2008 13:23:44 +0200
+ -- Michael Prokop <mika@grml.org>  Mon, 29 Sep 2008 13:29:18 +0200
 
 grml-live (0.9.3) unstable; urgency=low
 
diff --git a/grml-live b/grml-live
index 9fca1cc..2d0d1f9 100755
--- a/grml-live
+++ b/grml-live
@@ -49,7 +49,7 @@ Usage examples:
 
     $PN
     $PN -c GRMLBASE,GRML_MEDIUM,I386 -o /dev/shm/grml
-    $PN -c GRMLBASE,GRML_SMALL,I386 -g grml-small -v 1.0
+    $PN -c GRMLBASE,GRML_SMALL,REMOVE_DOCS,I386 -g grml-small -v 1.0
     $PN -c GRMLBASE,GRML_FULL,I386 -i grml_0.0-1.iso -v 0.0-1
     $PN -c GRMLBASE,GRML_FULL,I386 -s sid -V -r 'grml-live rocks'
 
@@ -481,11 +481,13 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       ewarn "$BUILD_OUTPUT/boot exists already, skipping stage 'boot'" ; eend 0
    else
       # booting stuff:
-      [ -d "$BUILD_OUTPUT"/boot/addons   ] || mkdir -p "$BUILD_OUTPUT"/boot/addons
       [ -d "$BUILD_OUTPUT"/boot/isolinux ] || mkdir -p "$BUILD_OUTPUT"/boot/isolinux
       [ -d "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}" ] || mkdir -p "$BUILD_OUTPUT"/boot/"${SHORT_GRML_NAME}"
 
-      cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/addons/memtest
+      if [ -z "$NO_ADDONS" ] ; then
+         [ -d "$BUILD_OUTPUT"/boot/addons   ] || mkdir -p "$BUILD_OUTPUT"/boot/addons
+         cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/addons/memtest
+      fi
 
       # if we don't have an initrd we a) can't boot and b) there was an error
       # during build, so check for the file:
@@ -516,7 +518,10 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
       fi
 
       cp ${TEMPLATE_DIRECTORY}/boot/isolinux/*  "$BUILD_OUTPUT"/boot/isolinux/
-      cp ${TEMPLATE_DIRECTORY}/boot/addons/*    "$BUILD_OUTPUT"/boot/addons/
+
+      if [ -z "$NO_ADDONS" ] ; then
+         cp ${TEMPLATE_DIRECTORY}/boot/addons/*    "$BUILD_OUTPUT"/boot/addons/
+      fi
 
       if ! [ -d "${BUILD_OUTPUT}/boot/grub" ] ; then
          cp -a ${TEMPLATE_DIRECTORY}/boot/grub  "$BUILD_OUTPUT"/boot/
-- 
2.1.4