[SCM] debian-live/config-webc branch, master, updated. 38b23eabb098ef4263643352adee7be8fc8fc67e

[Kai Hendry]

The following commit has been merged in the master branch:
commit 38b23eabb098ef4263643352adee7be8fc8fc67e
Author: Kai Hendry <hendry at iki.fi>
Date:   Thu Oct 13 17:52:17 2011 +0200

    memtest not needed

diff --git a/webconverger/auto/config b/webconverger/auto/config
index f2b8f46..2232306 100755
--- a/webconverger/auto/config
+++ b/webconverger/auto/config
@@ -17,6 +17,7 @@ lb config noauto --clean \
 	--apt-indices false \
 	--archive-areas "main contrib non-free" \
 	--apt-recommends false \
+	--memtest none \
 	--source false \
 	--archives live \
 	${@}
diff --git a/webconverger/config/package-lists/webc.list.chroot b/webconverger/config/package-lists/webc.list.chroot
index 3115dba..f5fe5d5 100644
--- a/webconverger/config/package-lists/webc.list.chroot
+++ b/webconverger/config/package-lists/webc.list.chroot
@@ -54,7 +54,7 @@ firmware-linux-nonfree
 #firmware-b43-installer
 firmware-linux-free
 #TODO hook broken?
-#firmware-ipw2x00
+firmware-ipw2x00
 firmware-iwlwifi
 
 # printing

-- 
debian-live/config-webc