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

[Kai Hendry]

The following commit has been merged in the master branch:
commit 693968218f080eb99c1fc892da6544c100fa6ef6
Author: Kai Hendry <hendry at iki.fi>
Date:   Sun Jul 12 13:20:36 2009 +0100

    Trying out Mike Hommey's work
    http://glandium.org/blog/?p=406

diff --git a/webconverger/config/binary_grub/menu.lst b/webconverger/config/binary_grub/menu.lst
index 4e199f3..fbfac87 100644
--- a/webconverger/config/binary_grub/menu.lst
+++ b/webconverger/config/binary_grub/menu.lst
@@ -1,15 +1,8 @@
-default 1
-timeout     10
+default 0
+timeout     5
 color cyan/blue white/blue
 splashimage /boot/grub/splash.xpm.gz
 
 LINUX_LIVE
 
-title		Install:
-root
-
-title		Install Webconverger
-kernel		/install/gtk/vmlinuz auto=true priority=critical video=vesa:ywrap,mtrr vga=788 quiet auto locale=en_US languagechooser/language-name=English DEBCONF_PRIORITY=critical file=/cdrom/install/preseed.cfg interface=auto -- quiet
-initrd		/install/gtk/initrd.gz
-
 MEMTEST
diff --git a/webconverger/config/chroot_local-hooks/webconverger b/webconverger/config/chroot_local-hooks/webconverger
index c36bd15..074058f 100755
--- a/webconverger/config/chroot_local-hooks/webconverger
+++ b/webconverger/config/chroot_local-hooks/webconverger
@@ -8,3 +8,6 @@ update-rc.d -f nostromo remove
 #
 # hence :
 apt-get update
+echo 'APT::Default-Release "stable";' > /etc/apt/apt.conf.d/default
+apt-get install -t testing libstartup-notification0 libsqlite3-0 libnss3-1d libhunspell-1.2-0 libasound2
+apt-get install iceweasel/experimental
diff --git a/webconverger/config/chroot_sources/ff3.chroot b/webconverger/config/chroot_sources/ff3.chroot
new file mode 100644
index 0000000..456fcf2
--- /dev/null
+++ b/webconverger/config/chroot_sources/ff3.chroot
@@ -0,0 +1,2 @@
+deb http://ftp.de.debian.org/debian testing main
+deb http://ftp.de.debian.org/debian experimental main

-- 
debian-live/config-webc