X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F14locales;h=29c405bffa6b92b872efcd5b1c355e212ea3f7b9;hb=35c1bf15ba1c4e64376e42fd796c4c08cfbc8389;hp=aa75369b82de52ff32f2cd07d29e075ff03f269d;hpb=335d3be3a325338956ede23a3fc27b9e907adbed;p=live-boot-grml.git

diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
index aa75369..29c405b 100755
--- a/scripts/live-bottom/14locales
+++ b/scripts/live-bottom/14locales
@@ -29,6 +29,9 @@ fi
 
 log_begin_msg "Setting up locales"
 
+# Cosmetic line wrapping for output of local-gen
+echo
+
 # live-initramfs script
 
 if [ -e /root/etc/default/locale ]
@@ -113,7 +116,13 @@ then
 	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/local-gen > /dev/null 2>&1
+	fi
 fi
 
 log_end_msg