Adding upstream version 1.157.1.

[live-boot-grml.git] / scripts / live-bottom / 14locales

diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
index aa75369..6348338 100755 (executable)
--- 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