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

diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
index aa75369..6348338 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/locale-gen > /dev/null 2>&1
+	fi
 fi
 
 log_end_msg