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

[Kai Hendry]

The following commit has been merged in the master branch:
commit e664c85af0d5f104f61df938577037732b4eef5c
Author: Kai Hendry <hendry at iki.fi>
Date:   Tue Oct 4 12:39:14 2011 +0200

    now building with 3.0~a33
    TODO: get dba to review
    Workout why firmware-ipw2x00 fails to install despite config/hooks/ipw.chroot
    Workout why ISO is so huge

diff --git a/webconverger/auto/config b/webconverger/auto/config
index 481509d..f2b8f46 100755
--- a/webconverger/auto/config
+++ b/webconverger/auto/config
@@ -15,6 +15,8 @@ lb config noauto --clean \
 	--debian-installer false \
 	--syslinux-theme webc \
 	--apt-indices false \
+	--archive-areas "main contrib non-free" \
+	--apt-recommends false \
 	--source false \
 	--archives live \
 	${@}
diff --git a/webconverger/config/chroot_sources/artax-backports.chroot.gpg b/webconverger/config/archives/artax-backports.key
similarity index 100%
rename from webconverger/config/chroot_sources/artax-backports.chroot.gpg
rename to webconverger/config/archives/artax-backports.key
diff --git a/webconverger/config/chroot_sources/artax-backports.chroot b/webconverger/config/archives/artax-backports.list
similarity index 100%
rename from webconverger/config/chroot_sources/artax-backports.chroot
rename to webconverger/config/archives/artax-backports.list
diff --git a/webconverger/config/archives/artax-restricted.key b/webconverger/config/archives/artax-restricted.key
new file mode 120000
index 0000000..f1de942
--- /dev/null
+++ b/webconverger/config/archives/artax-restricted.key
@@ -0,0 +1 @@
+artax-backports.key
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/artax-restricted.chroot b/webconverger/config/archives/artax-restricted.list
similarity index 100%
rename from webconverger/config/chroot_sources/artax-restricted.chroot
rename to webconverger/config/archives/artax-restricted.list
diff --git a/webconverger/config/chroot_sources/webc.chroot.gpg b/webconverger/config/archives/webc.key
similarity index 100%
rename from webconverger/config/chroot_sources/webc.chroot.gpg
rename to webconverger/config/archives/webc.key
diff --git a/webconverger/config/chroot_sources/webc.chroot b/webconverger/config/archives/webc.list
similarity index 100%
rename from webconverger/config/chroot_sources/webc.chroot
rename to webconverger/config/archives/webc.list
diff --git a/webconverger/config/chroot_local-packages/plymouth_0.8.3-17webconverger2.tar.gz b/webconverger/config/chroot_packages/plymouth_0.8.3-17webconverger2.tar.gz
similarity index 100%
rename from webconverger/config/chroot_local-packages/plymouth_0.8.3-17webconverger2.tar.gz
rename to webconverger/config/chroot_packages/plymouth_0.8.3-17webconverger2.tar.gz
diff --git a/webconverger/config/chroot_local-packages/plymouth_0.8.3-17webconverger2_i386.deb b/webconverger/config/chroot_packages/plymouth_0.8.3-17webconverger2_i386.deb
similarity index 100%
rename from webconverger/config/chroot_local-packages/plymouth_0.8.3-17webconverger2_i386.deb
rename to webconverger/config/chroot_packages/plymouth_0.8.3-17webconverger2_i386.deb
diff --git a/webconverger/config/chroot_sources/artax-backports.binary b/webconverger/config/chroot_sources/artax-backports.binary
deleted file mode 120000
index 33d469b..0000000
--- a/webconverger/config/chroot_sources/artax-backports.binary
+++ /dev/null
@@ -1 +0,0 @@
-artax-backports.chroot
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/artax-backports.binary.gpg b/webconverger/config/chroot_sources/artax-backports.binary.gpg
deleted file mode 120000
index b08c154..0000000
--- a/webconverger/config/chroot_sources/artax-backports.binary.gpg
+++ /dev/null
@@ -1 +0,0 @@
-artax-backports.chroot.gpg
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/artax-restricted.binary b/webconverger/config/chroot_sources/artax-restricted.binary
deleted file mode 120000
index 373cb5e..0000000
--- a/webconverger/config/chroot_sources/artax-restricted.binary
+++ /dev/null
@@ -1 +0,0 @@
-artax-restricted.chroot
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/artax-restricted.binary.gpg b/webconverger/config/chroot_sources/artax-restricted.binary.gpg
deleted file mode 120000
index b08c154..0000000
--- a/webconverger/config/chroot_sources/artax-restricted.binary.gpg
+++ /dev/null
@@ -1 +0,0 @@
-artax-backports.chroot.gpg
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/artax-restricted.chroot.gpg b/webconverger/config/chroot_sources/artax-restricted.chroot.gpg
deleted file mode 120000
index b08c154..0000000
--- a/webconverger/config/chroot_sources/artax-restricted.chroot.gpg
+++ /dev/null
@@ -1 +0,0 @@
-artax-backports.chroot.gpg
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/webc.binary b/webconverger/config/chroot_sources/webc.binary
deleted file mode 120000
index d74dada..0000000
--- a/webconverger/config/chroot_sources/webc.binary
+++ /dev/null
@@ -1 +0,0 @@
-webc.chroot
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/webc.binary.gpg b/webconverger/config/chroot_sources/webc.binary.gpg
deleted file mode 120000
index 07068a3..0000000
--- a/webconverger/config/chroot_sources/webc.binary.gpg
+++ /dev/null
@@ -1 +0,0 @@
-webc.chroot.gpg
\ No newline at end of file
diff --git a/webconverger/config/chroot_local-hooks/ipw.sh b/webconverger/config/hooks/ipw.chroot
similarity index 100%
rename from webconverger/config/chroot_local-hooks/ipw.sh
rename to webconverger/config/hooks/ipw.chroot
diff --git a/webconverger/config/chroot_local-includes/etc/iceweasel/pref/iceweasel.js b/webconverger/config/includes.chroot/etc/iceweasel/pref/iceweasel.js
similarity index 100%
rename from webconverger/config/chroot_local-includes/etc/iceweasel/pref/iceweasel.js
rename to webconverger/config/includes.chroot/etc/iceweasel/pref/iceweasel.js
diff --git a/webconverger/config/chroot_local-includes/etc/iptables.conf b/webconverger/config/includes.chroot/etc/iptables.conf
similarity index 100%
rename from webconverger/config/chroot_local-includes/etc/iptables.conf
rename to webconverger/config/includes.chroot/etc/iptables.conf
diff --git a/webconverger/config/chroot_local-includes/etc/mozpluggerrc b/webconverger/config/includes.chroot/etc/mozpluggerrc
similarity index 100%
rename from webconverger/config/chroot_local-includes/etc/mozpluggerrc
rename to webconverger/config/includes.chroot/etc/mozpluggerrc
diff --git a/webconverger/config/chroot_local-includes/etc/network/if-up.d/apt-upgrade b/webconverger/config/includes.chroot/etc/network/if-up.d/apt-upgrade
similarity index 100%
rename from webconverger/config/chroot_local-includes/etc/network/if-up.d/apt-upgrade
rename to webconverger/config/includes.chroot/etc/network/if-up.d/apt-upgrade
diff --git a/webconverger/config/chroot_local-includes/etc/network/if-up.d/ping b/webconverger/config/includes.chroot/etc/network/if-up.d/ping
similarity index 100%
rename from webconverger/config/chroot_local-includes/etc/network/if-up.d/ping
rename to webconverger/config/includes.chroot/etc/network/if-up.d/ping
diff --git a/webconverger/config/chroot_local-includes/etc/network/interfaces b/webconverger/config/includes.chroot/etc/network/interfaces
similarity index 100%
rename from webconverger/config/chroot_local-includes/etc/network/interfaces
rename to webconverger/config/includes.chroot/etc/network/interfaces
diff --git a/webconverger/config/chroot_local-includes/etc/sysctl.conf b/webconverger/config/includes.chroot/etc/sysctl.conf
similarity index 100%
rename from webconverger/config/chroot_local-includes/etc/sysctl.conf
rename to webconverger/config/includes.chroot/etc/sysctl.conf
diff --git a/webconverger/config/chroot_local-includes/usr/share/syslinux/themes/webc/isolinux-live/syslinux.cfg b/webconverger/config/includes.chroot/usr/share/syslinux/themes/webc/isolinux-live/syslinux.cfg
similarity index 100%
rename from webconverger/config/chroot_local-includes/usr/share/syslinux/themes/webc/isolinux-live/syslinux.cfg
rename to webconverger/config/includes.chroot/usr/share/syslinux/themes/webc/isolinux-live/syslinux.cfg
diff --git a/webconverger/config/chroot_local-includes/usr/share/syslinux/themes/webc/syslinux-live b/webconverger/config/includes.chroot/usr/share/syslinux/themes/webc/syslinux-live
similarity index 100%
rename from webconverger/config/chroot_local-includes/usr/share/syslinux/themes/webc/syslinux-live
rename to webconverger/config/includes.chroot/usr/share/syslinux/themes/webc/syslinux-live
diff --git a/webconverger/config/chroot_local-packagelists/webconverger.list b/webconverger/config/package-lists/webc.chroot.list
similarity index 96%
rename from webconverger/config/chroot_local-packagelists/webconverger.list
rename to webconverger/config/package-lists/webc.chroot.list
index 4d30240..3115dba 100644
--- a/webconverger/config/chroot_local-packagelists/webconverger.list
+++ b/webconverger/config/package-lists/webc.chroot.list
@@ -51,9 +51,10 @@ wireless-tools
 wireless-regdb
 crda
 firmware-linux-nonfree
-firmware-b43-installer
+#firmware-b43-installer
 firmware-linux-free
-firmware-ipw2x00
+#TODO hook broken?
+#firmware-ipw2x00
 firmware-iwlwifi
 
 # printing
diff --git a/webconverger/config/chroot_local-preseed/firmware-nonfree b/webconverger/config/preseed/firmware-nonfree.preseed
similarity index 100%
rename from webconverger/config/chroot_local-preseed/firmware-nonfree
rename to webconverger/config/preseed/firmware-nonfree.preseed

-- 
debian-live/config-webc