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

[Kai Hendry]

The following commit has been merged in the master branch:
commit b1bcd7c9e4cf38182c17933821ac8d6c5f65dd59
Author: Kai Hendry <hendry at iki.fi>
Date:   Tue Apr 14 23:09:40 2009 +0200

    2.6.29

diff --git a/webconverger/config/chroot_local-hooks/zzzminimal b/webconverger/config/chroot_local-hooks/zzzminimal
index 5f15178..8b4cd05 100755
--- a/webconverger/config/chroot_local-hooks/zzzminimal
+++ b/webconverger/config/chroot_local-hooks/zzzminimal
@@ -12,7 +12,7 @@ set -e
 echo Removing unused packages
 for PACKAGE in apt-utils aptitude man-db manpages info libxapian15 grub grub-common vim-common vim-tiny \
 	tcpd netcat-traditional gcc gcc-4.1 gcc-4.1-base gcc-4.2 gcc-4.2-base xserver-xorg-video-dummy ed dmidecode menu \
-	iptables rsyslog nano
+	rsyslog nano
 do
 	if apt-get remove --purge --yes "${PACKAGE}"
 	then
diff --git a/webconverger/config/chroot_sources/kernel-backports.binary b/webconverger/config/chroot_sources/kernel-backports.binary
new file mode 100644
index 0000000..ebc49db
--- /dev/null
+++ b/webconverger/config/chroot_sources/kernel-backports.binary
@@ -0,0 +1,2 @@
+deb http://backports.undebian.org/repositories/backports-kernel/ ./
+deb-src http://backports.undebian.org/repositories/backports-kernel/ ./
diff --git a/webconverger/config/chroot_sources/live-snapshots.chroot.gpg b/webconverger/config/chroot_sources/kernel-backports.binary.gpg
similarity index 100%
copy from webconverger/config/chroot_sources/live-snapshots.chroot.gpg
copy to webconverger/config/chroot_sources/kernel-backports.binary.gpg
diff --git a/webconverger/config/chroot_sources/kernel-backports.chroot b/webconverger/config/chroot_sources/kernel-backports.chroot
new file mode 120000
index 0000000..75a2259
--- /dev/null
+++ b/webconverger/config/chroot_sources/kernel-backports.chroot
@@ -0,0 +1 @@
+kernel-backports.binary
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/kernel-backports.chroot.gpg b/webconverger/config/chroot_sources/kernel-backports.chroot.gpg
new file mode 120000
index 0000000..bf7038f
--- /dev/null
+++ b/webconverger/config/chroot_sources/kernel-backports.chroot.gpg
@@ -0,0 +1 @@
+kernel-backports.binary.gpg
\ No newline at end of file
diff --git a/webconverger/scripts/config b/webconverger/scripts/config
index 4e6be99..34d62c1 100755
--- a/webconverger/scripts/config
+++ b/webconverger/scripts/config
@@ -21,6 +21,7 @@ lh_config noautoconfig \
 	--distribution lenny \
 	--iso-publisher "Webconverger; http://webconverger.com/; support at webconverger.com" \
 	--iso-volume "Webconverger $(date +%Y%m%d-%H:%M)" \
+	--linux-packages "linux-image-2.6.29-backports.1 aufs-modules-2.6.29-backports.1" \
 	--memtest none \
 	--syslinux-splash config/binary_syslinux/splash.rle \
 	--syslinux-timeout 5 \

-- 
debian-live/config-webc