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

[Kai Hendry]

The following commit has been merged in the master branch:
commit 08e0d32f8820aa9167d7bd1fcb02351e7442e72c
Author: Kai Hendry <hendry at iki.fi>
Date:   Wed Aug 19 20:26:20 2009 +0200

    fixes for ISO

diff --git a/webconverger/config/binary_debian-installer/preseed.cfg b/webconverger/config/binary_debian-installer/preseed.cfg
index 9af324a..a4fcf3a 100644
--- a/webconverger/config/binary_debian-installer/preseed.cfg
+++ b/webconverger/config/binary_debian-installer/preseed.cfg
@@ -51,4 +51,4 @@ d-i     popularity-contest/participate  boolean false
 # Process custom postinst
 d-i     preseed/late_command string sh  /cdrom/install/late_command.sh
 
-d-i     debian-installer/add-kernel-opts        string   splash video=vesa:ywrap,mtrr vga=788 nosudo
+#d-i     debian-installer/add-kernel-opts        string   splash video=vesa:ywrap,mtrr vga=788 nosudo
diff --git a/webconverger/config/binary_grub/menu.lst b/webconverger/config/binary_grub/menu.lst
index b2a1360..743f054 100644
--- a/webconverger/config/binary_grub/menu.lst
+++ b/webconverger/config/binary_grub/menu.lst
@@ -1,6 +1,14 @@
-default 0
+default 1
 timeout     10
-color cyan/blue white/blue
+color magenta/blue black/magenta
 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
+
diff --git a/webconverger/config/chroot_sources/acroread.binary b/webconverger/config/chroot_sources/acroread.binary
deleted file mode 120000
index 3a79902..0000000
--- a/webconverger/config/chroot_sources/acroread.binary
+++ /dev/null
@@ -1 +0,0 @@
-acroread.chroot
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/acroread.chroot b/webconverger/config/chroot_sources/acroread.chroot
deleted file mode 100644
index a83a748..0000000
--- a/webconverger/config/chroot_sources/acroread.chroot
+++ /dev/null
@@ -1 +0,0 @@
-deb http://debian-multimedia.informatik.uni-erlangen.de/ stable main
diff --git a/webconverger/config/chroot_sources/acroread.chroot.gpg b/webconverger/config/chroot_sources/acroread.chroot.gpg
deleted file mode 100644
index 58a42f4..0000000
Binary files a/webconverger/config/chroot_sources/acroread.chroot.gpg and /dev/null differ
diff --git a/webconverger/scripts/config b/webconverger/scripts/config
index 6134bdc..e4e194d 100755
--- a/webconverger/scripts/config
+++ b/webconverger/scripts/config
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-MIRROR_DEBIAN="http://ftp.de.debian.org/debian"
+MIRROR_DEBIAN="ftp://mirror.hetzner.de/ftp.de.debian.org/debian/"
 
 lh_config noautoconfig \
 	--apt-recommends disabled \
@@ -25,8 +25,6 @@ lh_config noautoconfig \
 	--syslinux-splash config/binary_syslinux/splash.rle \
 	--syslinux-timeout 5 \
 	--mirror-bootstrap ${MIRROR_DEBIAN} \
-	--mirror-chroot ${MIRROR_DEBIAN} \
-	--mirror-binary "http://cdn.debian.net/debian/" \
 	--binary-indices disabled \
 	--packages-lists "webconverger" \
 	--win32-loader disabled \

-- 
debian-live/config-webc