Merge branch 'upstream'

[automated-distro-installer] / fai / config / hooks / instsoft.DEBIAN

diff --git a/fai/config/hooks/instsoft.DEBIAN b/fai/config/hooks/instsoft.DEBIAN
index 41191730a3a11a48ad13f07857184ce65dcdc0be..34e6ebbfbc92764394109d684c6ffc27c3b2d0ed 100755 (executable)
--- a/fai/config/hooks/instsoft.DEBIAN
+++ b/fai/config/hooks/instsoft.DEBIAN
@@ -9,12 +9,10 @@ fi
 
 fcopy -Bi /etc/apt/apt.conf.d/force_confdef
 
-# ian: on flidas this gives an error: update-locale: Error: invalid locale settings:  LANG=en_US.UTF-8
-# # in case the locales are already included inside the base file (Ubuntu)
-# if [ -f $target/usr/sbin/locale-gen ]; then
-#     $ROOTCMD dpkg-reconfigure -fnoninteractive locales
-#     exit
-# fi
+# in case the locales are already included inside the base file (Ubuntu)
+if [ -f $target/usr/sbin/locale-gen ]; then
+    exit
+fi
 
 # if we want to install locales, install them now
 install_packages -l 2>/dev/null | egrep  -q  ' locales|locales '