Merge branch 'upstream'

[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 8608333b0f3ff87e0724ac27ade18c7e82ddb10d..052bfc6a3b076460736367f6ccf12b8261c1604c 100755 (executable)
--- a/fai/config/scripts/DEBIAN/40-misc
+++ b/fai/config/scripts/DEBIAN/40-misc
@@ -58,8 +58,9 @@ 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 [ -d /etc/fai ]; then
-    ainsl -a /etc/fai/fai.conf "FAI_CONFIG_SRC=$FAI_CONFIG_SRC"
-    fcopy -Miv /etc/fai/fai.conf
+    if ! fcopy -Mv /etc/fai/fai.conf; then
+       ainsl -a /etc/fai/fai.conf "FAI_CONFIG_SRC=$FAI_CONFIG_SRC"
+    fi
 fi
 fcopy -iv /etc/rc.local