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 f036e2adc761e057d978a9719937a65c71f05fb9..34e6ebbfbc92764394109d684c6ffc27c3b2d0ed 100755 (executable)
--- a/fai/config/hooks/instsoft.DEBIAN
+++ b/fai/config/hooks/instsoft.DEBIAN
@@ -1,16 +1,25 @@
 #! /bin/bash
 
+set -x
 # if package locales will be installed, then install it early, before
 #  other packages
-
-if [ $FAI_ACTION != "install" ]; then
+if [ $FAI_ACTION != "install" -a $FAI_ACTION != "dirinstall" ]; then
    exit 0
 fi
 
 fcopy -Bi /etc/apt/apt.conf.d/force_confdef
-ainsl -av /etc/ucf.conf "conf_force_conffold=YES"
 
+# 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 '
 if [ $? -eq 0 ]; then
-   $ROOTCMD apt-get -y install locales
+    if [ X$verbose = X1 ]; then
+       $ROOTCMD apt-get -y install locales
+    else
+       $ROOTCMD apt-get -y install locales > /dev/null
+    fi
 fi