X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F25-locales;h=277b684f24cde5ac1bb2beb188506841c3f5a935;hp=6dc4d6681a09422218889602f0cf18e456d438bc;hb=HEAD;hpb=f6b5bf34638a2e0879c6d161b08c6523096e2ca3

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/25-locales b/etc/grml/fai/config/scripts/GRMLBASE/25-locales
index 6dc4d66..59a4e71 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/25-locales
+++ b/etc/grml/fai/config/scripts/GRMLBASE/25-locales
@@ -13,6 +13,9 @@ set -e
 # the full setup, GRMLBASE installs a minimal configuration
 fcopy -v /etc/locale.gen
 
+# set up /etc/locale.conf, to avoid systemd-firstboot prompting for user input
+fcopy -v /etc/locale.conf
+
 # get rid of locales unless using class LOCALES
 set +u
 if ! ifclass LOCALES ; then
@@ -42,13 +45,6 @@ if $ROOTCMD dpkg --list localepurge 2>&1 | grep -q '^ii' ; then
    $ROOTCMD dpkg-reconfigure -f noninteractive localepurge
 fi
 
-if ! [ -x $target/usr/sbin/locale-gen ] ; then
-   echo 'Warning: locale-gen [package locales] not installed'
-else
-   echo "Running locale-gen"
-   $ROOTCMD locale-gen
-fi
-
 if ! [ -x $target/usr/sbin/localepurge ] ; then
   echo "Warning: localepurge not installed"
 else
@@ -56,5 +52,16 @@ else
   $ROOTCMD localepurge
 fi
 
+if $ROOTCMD dpkg-query -s locales-all >/dev/null 2>&1 ; then
+  echo "locales-all installed, skipping locales generation"
+else
+  if ! [ -x ${target}/usr/sbin/locale-gen ] ; then
+    echo 'Warning: locale-gen [package locales] not installed'
+  else
+    echo "Running locale-gen"
+    $ROOTCMD locale-gen
+  fi
+fi
+
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2