[SCM] debian-live/live-initramfs branch, master, updated. 1.110.4-1-3-gd6fcb73

[Daniel Baumann]

The branch, master has been updated
       via  d6fcb73b6fe12c8b461e830a790325cd5f69adee (commit)
       via  0898141020222253d9b566a6727f4e33248f5711 (commit)
      from  0f368807adf0fcaccef710c3da855d72fd737117 (commit)


- Shortlog ------------------------------------------------------------
d6fcb73 Setting the kdm language, thanks to Jordi Pujol <jordi_pujol at telefonica.net>.
0898141 Using kdm initscript autologin overrides, thanks to Kel Modderman <kel at otaku42.de>.

Summary of changes:
 scripts/live-bottom/14locales   |   14 ++++++++++++++
 scripts/live-bottom/15autologin |   11 ++++++++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit d6fcb73b6fe12c8b461e830a790325cd5f69adee
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Nov 10 15:10:30 2007 +0100

    Setting the kdm language, thanks to Jordi Pujol <jordi_pujol at 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

commit 0898141020222253d9b566a6727f4e33248f5711
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Nov 10 15:04:44 2007 +0100

    Using kdm initscript autologin overrides, thanks to Kel Modderman <kel at otaku42.de>.

diff --git a/scripts/live-bottom/15autologin b/scripts/live-bottom/15autologin
index 03b66f4..41c98dc 100755
--- a/scripts/live-bottom/15autologin
+++ b/scripts/live-bottom/15autologin
@@ -55,7 +55,14 @@ then
 	${GDMCONF}
 fi
 
-if [ -f /root/etc/kde3/kdm/kdmrc ]
+if [ -d /root/etc/default/kdm.d/ ]
+then
+	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
 	sed -i -r -e "s/^#?AutoLoginEnable=.*\$/AutoLoginEnable=true/" \

-- 
debian-live/live-initramfs