From: Michael Prokop <devnull@localhost>
Date: Mon, 10 Dec 2007 20:47:54 +0000 (+0100)
Subject: Merged
X-Git-Tag: 0.0.13~27
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=0ede9c728472e6d5ff21e613fc390130d7fb95d8;hp=1078d0046fc36e65e909f235e5667bf35cf05b37

Merged
---

diff --git a/buildd/functions.sh b/buildd/functions.sh
index ebfc888..aa61132 100755
--- a/buildd/functions.sh
+++ b/buildd/functions.sh
@@ -58,7 +58,7 @@ grml_live_run() {
      fi
   fi
 
-  grml-live -F $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
+  grml-live -F $* $GRML_LIVE_ARCH -s $SUITE -c $CLASSES -o $OUTPUT_DIR \
             -g $NAME -v $DATE -r grml-live-autobuild -i $ISO_NAME \
             1>/var/log/grml-buildd.stdout \
             2>/var/log/grml-buildd.stderr ; RC=$?
diff --git a/buildd/grml-live_autobuild_grml-small_etch.sh b/buildd/grml-live_autobuild_grml-small_etch.sh
index a727c51..8d3cfb5 100755
--- a/buildd/grml-live_autobuild_grml-small_etch.sh
+++ b/buildd/grml-live_autobuild_grml-small_etch.sh
@@ -12,7 +12,7 @@ ARCH=i386
 . /usr/share/grml-live/buildd/functions.sh || exit 1
 
 # execute grml-live:
-grml_live_run
+grml_live_run -z
 
 create_logs
 # upload_logs
diff --git a/buildd/grml-live_autobuild_grml-small_sid.sh b/buildd/grml-live_autobuild_grml-small_sid.sh
index 5609a5e..2e809e5 100755
--- a/buildd/grml-live_autobuild_grml-small_sid.sh
+++ b/buildd/grml-live_autobuild_grml-small_sid.sh
@@ -12,7 +12,7 @@ ARCH=i386
 . /usr/share/grml-live/buildd/functions.sh || exit 1
 
 # execute grml-live:
-grml_live_run
+grml_live_run -z
 
 create_logs
 # upload_logs
diff --git a/buildd/grml-live_autobuild_grml64-small_etch.sh b/buildd/grml-live_autobuild_grml64-small_etch.sh
index 5335901..b76fb90 100755
--- a/buildd/grml-live_autobuild_grml64-small_etch.sh
+++ b/buildd/grml-live_autobuild_grml64-small_etch.sh
@@ -12,7 +12,7 @@ ARCH=amd64
 . /usr/share/grml-live/buildd/functions.sh || exit 1
 
 # execute grml-live:
-grml_live_run
+grml_live_run -z
 
 create_logs
 # upload_logs
diff --git a/buildd/grml-live_autobuild_grml64-small_sid.sh b/buildd/grml-live_autobuild_grml64-small_sid.sh
index 1c5def9..688f1e0 100755
--- a/buildd/grml-live_autobuild_grml64-small_sid.sh
+++ b/buildd/grml-live_autobuild_grml64-small_sid.sh
@@ -12,7 +12,7 @@ ARCH=amd64
 . /usr/share/grml-live/buildd/functions.sh || exit 1
 
 # execute grml-live:
-grml_live_run
+grml_live_run -z
 
 create_logs
 # upload_logs
diff --git a/debian/changelog b/debian/changelog
index 286417c..103edef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,12 @@ grml-live (0.0.13) unstable; urgency=low
 
   * Replace mailx with bsd-mailx in GRML_FULL.
     http://packages.qa.debian.org/b/bsd-mailx/news/20071209T135336Z.html
-  * buildd store_iso(): move md5sum file as well
   * Document grml2ram bootoption in grml-cheatcodes.txt
+  * Remove hwtools from GRML_FULL, see #397723
+  * buildd:
+    - store_iso(): move md5sum file as well
+    - support providing options via grml_live_run() so we can disable
+      LZMA for grml-small builds
 
  -- Michael Prokop <mika@grml.org>  Sun, 09 Dec 2007 22:38:31 +0100
 
diff --git a/etc/grml/fai/config/package_config/GRML_FULL b/etc/grml/fai/config/package_config/GRML_FULL
index d6f7e9e..4c9ce6c 100644
--- a/etc/grml/fai/config/package_config/GRML_FULL
+++ b/etc/grml/fai/config/package_config/GRML_FULL
@@ -833,7 +833,6 @@ httptunnel
 hunt
 hwdata
 hwinfo
-hwtools
 i810switch
 i8kutils
 ibod