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

[Kai Hendry]

The following commit has been merged in the master branch:
commit 3083a6a595264ffd8d91863a756eeafe4bcac7fc
Author: Kai Hendry <hendry at iki.fi>
Date:   Thu Oct 29 12:48:34 2009 +0100

    explicit selection of i18n packages
    disabled debian installer - it just confuses too many people

diff --git a/webconverger/config/binary_grub/menu.lst b/webconverger/config/binary_grub/menu.lst
index 743f054..804e7ed 100644
--- a/webconverger/config/binary_grub/menu.lst
+++ b/webconverger/config/binary_grub/menu.lst
@@ -1,14 +1,8 @@
-default 1
-timeout     10
-color magenta/blue black/magenta
+default 0
+timeout     1
+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..cd28045 100755
--- a/webconverger/config/chroot_local-hooks/webconverger
+++ b/webconverger/config/chroot_local-hooks/webconverger
@@ -1,6 +1,5 @@
 update-rc.d -f openbsd-inetd remove
 update-rc.d -f stop-bootlogd remove
-update-rc.d -f nostromo remove
 
 #Package grub is not available, but is referred to by another package.
 #This may mean that the package is missing, has been obsoleted, or
diff --git a/webconverger/config/chroot_local-packageslists/webconverger b/webconverger/config/chroot_local-packageslists/webconverger
index 26a613a..cb4bcfb 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@ -66,11 +66,98 @@ cupsys
 # cups-client
 
 # http://webconverger.org/i18n/
-iceweasel-l10n-all
-myspell-af
+
+# firewall
+iptables
+
+# powering down
+acpid
+acpi-support-base
+
+# Getting the time right for certificate checks
+ntpdate
+
+iputils-ping
+
+iceweasel-l10n-uk-ua
+iceweasel-l10n-sk
+iceweasel-l10n-da
+iceweasel-l10n-pt-pt
+iceweasel-l10n-ka
+iceweasel-l10n-kk
+iceweasel-l10n-be
+iceweasel-l10n-as
+iceweasel-l10n-pa-in
+iceweasel-l10n-es-es
+iceweasel-l10n-bg
+iceweasel-l10n-hu
+iceweasel-l10n-nl
+iceweasel-l10n-kn
+iceweasel-l10n-te
+iceweasel-l10n-sq
+iceweasel-l10n-bn-bd
+iceweasel-l10n-vi
+iceweasel-l10n-sr
+iceweasel-l10n-tr
+iceweasel-l10n-zh-tw
+iceweasel-l10n-es-mx
+iceweasel-l10n-mk
+iceweasel-l10n-en-gb
+iceweasel-l10n-es-cl
+iceweasel-l10n-nb-no
+iceweasel-l10n-lt
+iceweasel-l10n-fa
+iceweasel-l10n-ga-ie
+iceweasel-l10n-eo
+iceweasel-l10n-mn
+iceweasel-l10n-ja
+iceweasel-l10n-uk
+iceweasel-l10n-fi
+iceweasel-l10n-gu-in
+iceweasel-l10n-ca
+iceweasel-l10n-cy
+iceweasel-l10n-cs
+iceweasel-l10n-zh-cn
+iceweasel-l10n-fy-nl
+iceweasel-l10n-ar
+iceweasel-l10n-sl
+iceweasel-l10n-rm
+iceweasel-l10n-bn-in
+iceweasel-l10n-ku
+iceweasel-l10n-ro
+iceweasel-l10n-he
+iceweasel-l10n-is
+iceweasel-l10n-et
+iceweasel-l10n-hr
+iceweasel-l10n-eu
+iceweasel-l10n-af
+iceweasel-l10n-oc
+iceweasel-l10n-ru
+iceweasel-l10n-nn-no
+iceweasel-l10n-id
+iceweasel-l10n-th
+iceweasel-l10n-pt-br
+iceweasel-l10n-pl
+iceweasel-l10n-de
+iceweasel-l10n-mr
+iceweasel-l10n-ko
+iceweasel-l10n-sv-se
+iceweasel-l10n-si
+iceweasel-l10n-ml
+iceweasel-l10n-lv
+iceweasel-l10n-or
+iceweasel-l10n-fr
+iceweasel-l10n-it
+iceweasel-l10n-ta
+iceweasel-l10n-gl
+iceweasel-l10n-el
+iceweasel-l10n-es-ar
+iceweasel-l10n-hi-in
 myspell-bg
+myspell-eu-es
+myspell-gl-es
+myspell-af
 myspell-ca
-myspell-cs-cz
 myspell-da
 myspell-de-at
 myspell-de-ch
@@ -83,14 +170,11 @@ myspell-en-za
 myspell-eo
 myspell-es
 myspell-et
-myspell-eu-es
 myspell-fa
 myspell-fi
 myspell-fo
-myspell-fr
 myspell-ga
 myspell-gd
-myspell-gl-es
 myspell-gv
 myspell-he
 myspell-hr
@@ -104,7 +188,6 @@ myspell-nb
 myspell-nl
 myspell-nn
 myspell-pl
-myspell-pt
 myspell-pt-br
 myspell-pt-pt
 myspell-ru
@@ -114,16 +197,3 @@ myspell-sv-se
 myspell-sw
 myspell-th
 myspell-uk
-
-# firewall
-iptables
-
-# powering down
-acpid
-acpi-support-base
-
-# Getting the time right for certificate checks
-ntpdate
-
-iputils-ping
-
diff --git a/webconverger/scripts/config b/webconverger/scripts/config
index 51228cf..e223b10 100755
--- a/webconverger/scripts/config
+++ b/webconverger/scripts/config
@@ -7,7 +7,7 @@ lh_config noautoconfig \
 	--apt-recommends disabled \
 	--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 live \
+	--debian-installer disabled \
 	--debian-installer-distribution sid \
 	-k 486 \
 	-a i386 \

-- 
debian-live/config-webc