X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F14locales;h=e53e4877b89986ab1654dac8a8015bc7c99863a5;hb=e66f79476042794195978ee641aa7ea0d9ca6e0a;hp=aa75369b82de52ff32f2cd07d29e075ff03f269d;hpb=8af37a4799e7319e0b27571fad82b23d57ef2cc3;p=live-boot-grml.git

diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
index aa75369..e53e487 100755
--- a/scripts/live-bottom/14locales
+++ b/scripts/live-bottom/14locales
@@ -18,7 +18,7 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 if [ -n "${NOLOCALES}" ]
 then
@@ -29,7 +29,10 @@ fi
 
 log_begin_msg "Setting up locales"
 
-# live-initramfs script
+# Cosmetic line wrapping for output of local-gen
+echo
+
+# live-boot script
 
 if [ -e /root/etc/default/locale ]
 then
@@ -101,7 +104,10 @@ then
 
 	if [ -d /root/etc/default/kdm.d/ ]
 	then
-		printf 'LANGUAGE=%s\n' "${LANG}" >> /root/etc/default/kdm.d/live-autologin
+		if ! grep -qs "^LANGUAGE" "${LANG}"
+		then
+			printf 'LANGUAGE=%s\n' "${LANG}" >> /root/etc/default/kdm.d/live-autologin
+		fi
 	elif [ -f /root/etc/kde3/kdm/kdmrc ]
 	then
 		sed -i -r -e "s/#Language=.*/Language=${language}/" \
@@ -110,10 +116,16 @@ then
 
 	really_export LANG
 
-	printf 'LANG="%s"\n' "${LANG}" >> /root/etc/default/locale
-	printf 'LANG="%s"\n' "${LANG}" >> /root/etc/environment
+	printf 'LANG="%s"\n' "${LANG}" > /root/etc/default/locale
+	printf 'LANG="%s"\n' "${LANG}" > /root/etc/environment
 	printf '%s %s\n' "${LANG}" "${codepage}" > /root/etc/locale.gen
-	chroot /root /usr/sbin/locale-gen
+
+	if [ -z "${SILENT}" ]
+	then
+		chroot /root /usr/sbin/locale-gen
+	else
+		chroot /root /usr/sbin/locale-gen > /dev/null 2>&1
+	fi
 fi
 
 log_end_msg