merge upstream, untested

[automated-distro-installer] / fai / config / scripts / DEBIAN / 40-misc

diff --git a/fai/config/scripts/DEBIAN/40-misc b/fai/config/scripts/DEBIAN/40-misc
index a699fdb91f3522245f59a3546f4e73c517439b6f..8608333b0f3ff87e0724ac27ade18c7e82ddb10d 100755 (executable)
--- a/fai/config/scripts/DEBIAN/40-misc
+++ b/fai/config/scripts/DEBIAN/40-misc
@@ -57,16 +57,10 @@ ln -fs /proc/mounts $target/etc/mtab
 
 rm -f $target/etc/dpkg/dpkg.cfg.d/fai $target/etc/dpkg/dpkg.cfg.d/unsafe-io
 
-if [ $FAI_ACTION = "install" -o $FAI_ACTION = "dirinstall" ] ; then
-  if [ -f /etc/fai/fai.conf ]; then
-    mkdir -p $target/etc/fai
-    cp /etc/fai/fai.conf $target/etc/fai/fai.conf
-  fi
+if [ -d /etc/fai ]; then
+    ainsl -a /etc/fai/fai.conf "FAI_CONFIG_SRC=$FAI_CONFIG_SRC"
+    fcopy -Miv /etc/fai/fai.conf
 fi
-
-ainsl -a /etc/fai/fai.conf "FAI_CONFIG_SRC=$FAI_CONFIG_SRC"
-
-fcopy -Miv /etc/fai/fai.conf
 fcopy -iv /etc/rc.local
 
 exit $error