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

[Kai Hendry]

The following commit has been merged in the master branch:
commit ca631e28df6735038e19215a3fb1cbb040ec3a2d
Author: Kai Hendry <hendry at iki.fi>
Date:   Wed Aug 19 00:12:10 2009 +0200

    hooks to install packages on startup
    enabled ICMP ping for admin purposes

diff --git a/webconverger/config/chroot_local-includes/etc/iptables.conf b/webconverger/config/chroot_local-includes/etc/iptables.conf
index 0ee7a52..e7ba0d4 100644
--- a/webconverger/config/chroot_local-includes/etc/iptables.conf
+++ b/webconverger/config/chroot_local-includes/etc/iptables.conf
@@ -6,4 +6,5 @@
 -A INPUT -m state --state RELATED,ESTABLISHED -j ACCEPT
 -A INPUT -i lo -j ACCEPT
 -A INPUT -m udp -p udp --dport 631 -j ACCEPT
+-A INPUT -p icmp -m icmp --icmp-type 8 -j ACCEPT
 COMMIT
diff --git a/webconverger/config/chroot_local-includes/etc/network/if-up.d/apt-upgrade b/webconverger/config/chroot_local-includes/etc/network/if-up.d/apt-upgrade
new file mode 100755
index 0000000..eed1937
--- /dev/null
+++ b/webconverger/config/chroot_local-includes/etc/network/if-up.d/apt-upgrade
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+grep -qs " upgrade" /proc/cmdline || exit 0
+NOTTY="-q -y -o DPkg::Options::=--force-confdef"
+UPGRADEOPTS="dist-upgrade"
+DEBIAN_FRONTEND="noninteractive"
+export DEBIAN_FRONTEND
+logger "Upgrading"
+sleep 5
+apt-get -q=2 update && apt-get ${NOTTY} -u ${UPGRADEOPTS}
diff --git a/webconverger/config/chroot_local-includes/etc/network/if-up.d/chinese b/webconverger/config/chroot_local-includes/etc/network/if-up.d/chinese
new file mode 100755
index 0000000..67d09c8
--- /dev/null
+++ b/webconverger/config/chroot_local-includes/etc/network/if-up.d/chinese
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+grep -qs "locale=zh_CN.UTF-8" /proc/cmdline || exit 0
+NOTTY="-q -y -o DPkg::Options::=--force-confdef"
+DEBIAN_FRONTEND="noninteractive"
+export DEBIAN_FRONTEND
+PKGS="scim-chinese scim-tables-zh scim-uim xfonts-intl-chinese ttf-arphic-ukai ttf-arphic-uming xfonts-wqy iceweasel-l10n-zh-cn"
+logger "Setting up $0"
+sleep 5
+apt-get -q=2 update && apt-get ${NOTTY} install $PKGS
diff --git a/webconverger/config/chroot_local-includes/etc/network/if-up.d/japanese b/webconverger/config/chroot_local-includes/etc/network/if-up.d/japanese
new file mode 100755
index 0000000..65ead6f
--- /dev/null
+++ b/webconverger/config/chroot_local-includes/etc/network/if-up.d/japanese
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+grep -qs "locale=ja_JP.UTF-8" /proc/cmdline || exit 0
+NOTTY="-q -y -o DPkg::Options::=--force-confdef"
+DEBIAN_FRONTEND="noninteractive"
+export DEBIAN_FRONTEND
+PKGS="ttf-vlgothic scim-anthy scim-uim scim-skk scim-prime scim-canna scim-tables-ja iceweasel-l10n-ja"
+logger "Setting up $0"
+sleep 5
+apt-get -q=2 update && apt-get ${NOTTY} install $PKGS
diff --git a/webconverger/config/chroot_local-includes/etc/network/if-up.d/korean b/webconverger/config/chroot_local-includes/etc/network/if-up.d/korean
new file mode 100755
index 0000000..38bebe7
--- /dev/null
+++ b/webconverger/config/chroot_local-includes/etc/network/if-up.d/korean
@@ -0,0 +1,9 @@
+#!/bin/sh -e
+grep -qs "locale=ko_KR.UTF-8" /proc/cmdline || exit 0
+NOTTY="-q -y -o DPkg::Options::=--force-confdef"
+DEBIAN_FRONTEND="noninteractive"
+export DEBIAN_FRONTEND
+PKGS="scim-hangul scim-tables-ko scim-uim ttf-unfonts ttf-alee xfonts-baekmuk iceweasel-l10n-ko"
+logger "Setting up $0"
+sleep 5
+apt-get -q=2 update && apt-get ${NOTTY} install $PKGS
diff --git a/webconverger/config/chroot_local-packageslists/webconverger b/webconverger/config/chroot_local-packageslists/webconverger
index 4535bb0..0667305 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@ -125,6 +125,3 @@ acpi-support-base
 # Getting the time right for certificate checks
 ntpdate
 
-# CJK helpers
-live-initscripts
-

-- 
debian-live/config-webc