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

[Kai Hendry]

The following commit has been merged in the master branch:
commit d8fce0d8bf9bbd20a789a241be1c6dc8b57d4f7c
Author: Kai Hendry <hendry at iki.fi>
Date:   Wed Jan 6 23:26:42 2010 +0100

    revert to 486 and add Daniel's mozilla backport repo

diff --git a/webconverger/config/chroot_sources/mozilla.binary b/webconverger/config/chroot_sources/mozilla.binary
new file mode 120000
index 0000000..cdd071e
--- /dev/null
+++ b/webconverger/config/chroot_sources/mozilla.binary
@@ -0,0 +1 @@
+mozilla.chroot
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/mozilla.binary.gpg b/webconverger/config/chroot_sources/mozilla.binary.gpg
new file mode 120000
index 0000000..5c2dca0
--- /dev/null
+++ b/webconverger/config/chroot_sources/mozilla.binary.gpg
@@ -0,0 +1 @@
+mozilla.chroot.gpg
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/mozilla.chroot b/webconverger/config/chroot_sources/mozilla.chroot
new file mode 100644
index 0000000..1b4aa45
--- /dev/null
+++ b/webconverger/config/chroot_sources/mozilla.chroot
@@ -0,0 +1,2 @@
+deb http://backports.debian-maintainers.org/ lenny/backports-client-mozilla main contrib non-free
+deb-src http://backports.debian-maintainers.org/ lenny/backports-client-mozilla main contrib non-free
diff --git a/webconverger/config/chroot_sources/restricted.chroot.gpg b/webconverger/config/chroot_sources/mozilla.chroot.gpg
similarity index 98%
copy from webconverger/config/chroot_sources/restricted.chroot.gpg
copy to webconverger/config/chroot_sources/mozilla.chroot.gpg
index 889b7f1..3456d93 100644
--- a/webconverger/config/chroot_sources/restricted.chroot.gpg
+++ b/webconverger/config/chroot_sources/mozilla.chroot.gpg
@@ -1,5 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v1.4.10 (GNU/Linux)
 
 mQINBEqdKDABEADBLagcqCJZea/V62l/ow6qo0gjmMOSiF8oi5HJmFfHoX1hogTP
 JCaemzc8/CVBQ9ryLRyIfxVT367tBHweWFIEJZUnNINFYLsQms8WOex5fKZkRrox
diff --git a/webconverger/scripts/config b/webconverger/scripts/config
index 8b91c62..0759807 100755
--- a/webconverger/scripts/config
+++ b/webconverger/scripts/config
@@ -8,7 +8,7 @@ lh config noautoconfig \
 	--bootappend-live "quiet homepage=http://portal.webconverger.com nonetworking nosudo splash video=vesa:ywrap,mtrr vga=788 nopersistent quickreboot" \
 	--cache-stages "bootstrap rootfs" \
 	--debian-installer-distribution sid \
-	-k 686 \
+	-k 486 \
 	-a i386 \
 	-f minimal \
 	-b usb-hdd \

-- 
debian-live/config-webc