From: Daniel Baumann <daniel@debian.org>
Date: Sat, 10 Nov 2007 14:10:30 +0000 (+0100)
Subject: Setting the kdm language, thanks to Jordi Pujol <jordi_pujol@telefonica.net>.
X-Git-Tag: debian/2.0.15-1~639
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=be2ffbd8c2fd7ea473666292c77be6786a00741c;p=live-boot-grml.git

Setting the kdm language, thanks to Jordi Pujol <jordi_pujol@telefonica.net>.
---

diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
index 3653e1b..3cb58dd 100755
--- a/scripts/live-bottom/14locales
+++ b/scripts/live-bottom/14locales
@@ -79,6 +79,20 @@ then
 
 	LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 | sed -e 's, .*,,' -e q)
 
+	language="${LANG%%.UTF-8*}"
+	if [ -d /root/etc/default/kdm.d/ ]
+	then
+
+cat > /root/etc/default/kdm.d/live-autologin << EOF
+LANGUAGE=${language}
+EOF
+
+	elif [ -f /root/etc/kde3/kdm/kdmrc ]
+	then
+		sed -i -r -e "s/#Language=.*/Language=${language}/" \
+			/root/etc/kde3/kdm/kdmrc
+	fi
+
 	if [ -z "${LANG}" ]
 	then
 		log_warning_message "Locale ${locale} is unsupported."
diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 41c98dc..10cae2d 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -57,11 +57,13 @@ fi
 
 if [ -d /root/etc/default/kdm.d/ ]
 then
-	cat > /root/etc/default/kdm.d/live-autologin << EOF
+
+cat >> /root/etc/default/kdm.d/live-autologin << EOF
 AUTOLOGINUSER=${USERNAME}
 AUTOLOGINAGAIN=true
 AUTOLOGINDELAY=0
 EOF
+
 elif [ -f /root/etc/kde3/kdm/kdmrc ]
 then
 	# Configure KDM autologin