X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F14locales;h=94e3cf2c97e76ab8d6184030833456bf26b95c5b;hb=bd2cfbec5fe67ea696162c1caa5c80187a070bee;hp=3cb58dd4244de09ce34ab21f8c9a0216e18baa33;hpb=f032960aa51902c82456e58dbdb28587eea30077;p=live-boot-grml.git

diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
index 3cb58dd..94e3cf2 100755
--- a/scripts/live-bottom/14locales
+++ b/scripts/live-bottom/14locales
@@ -44,8 +44,6 @@ if [ -n "${grep_file}" ]
 then
 	# use rootfs configured locale
 	locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' )
-else
-	grep_file=/root/etc/default/locale
 fi
 
 if [ -n "${LOCALE}" ]
@@ -95,14 +93,15 @@ EOF
 
 	if [ -z "${LANG}" ]
 	then
-		log_warning_message "Locale ${locale} is unsupported."
+		log_warning_msg "Locale ${locale} is unsupported."
 		locale="en_US.UTF-8"
 		LANG="${locale}"
 	fi
 
 	really_export LANG
 
-	printf 'LANG=%s\n' "${LANG}" > "${grep_file}"
+	printf 'LANG="%s"\n' "${LANG}" >> /root/etc/default/locale
+	printf 'LANG="%s"\n' "${LANG}" >> /root/etc/environment
 	printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
 	chroot /root /usr/sbin/locale-gen
 fi