X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fhooks%2Finstsoft.DEBIAN;h=34e6ebbfbc92764394109d684c6ffc27c3b2d0ed;hb=3d9cc96092cdc8aa05bc95cf83c07bb1af692013;hp=355f46d4f1a0743c8a940b3b7b59df149af8d6e5;hpb=5f680f6bea2faae10ca8e5ccea0d08d18ccc9aa1;p=automated-distro-installer

diff --git a/fai/config/hooks/instsoft.DEBIAN b/fai/config/hooks/instsoft.DEBIAN
index 355f46d..34e6ebb 100755
--- a/fai/config/hooks/instsoft.DEBIAN
+++ b/fai/config/hooks/instsoft.DEBIAN
@@ -8,14 +8,11 @@ if [ $FAI_ACTION != "install" -a $FAI_ACTION != "dirinstall" ]; then
 fi
 
 fcopy -Bi /etc/apt/apt.conf.d/force_confdef
-ainsl -a  /etc/ucf.conf "^conf_force_conffold=YES"
 
-# 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 '