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

[Kai Hendry]

The following commit has been merged in the master branch:
commit 8f01a20978d7a3be891d956df4c0300cbd5b9707
Author: Kai Hendry <hendry at iki.fi>
Date:   Mon Jul 13 21:16:05 2009 +0200

    Revert "Trying out Mike Hommey's work"
    
    This reverts commit 693968218f080eb99c1fc892da6544c100fa6ef6.

diff --git a/webconverger/config/binary_grub/menu.lst b/webconverger/config/binary_grub/menu.lst
index fbfac87..4e199f3 100644
--- a/webconverger/config/binary_grub/menu.lst
+++ b/webconverger/config/binary_grub/menu.lst
@@ -1,8 +1,15 @@
-default 0
-timeout     5
+default 1
+timeout     10
 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 074058f..c36bd15 100755
--- a/webconverger/config/chroot_local-hooks/webconverger
+++ b/webconverger/config/chroot_local-hooks/webconverger
@@ -8,6 +8,3 @@ 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
deleted file mode 100644
index 456fcf2..0000000
--- a/webconverger/config/chroot_sources/ff3.chroot
+++ /dev/null
@@ -1,2 +0,0 @@
-deb http://ftp.de.debian.org/debian testing main
-deb http://ftp.de.debian.org/debian experimental main

-- 
debian-live/config-webc