update to 31b795ca71189b326b80666076398f31aea4f2be

[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 4376ab4b99d6db91529f0eec132cc2d24ddb4314..714be559ca00935587199405a90e7d593f127605 100755 (executable)
--- a/fai/config/scripts/DEBIAN/40-misc
+++ b/fai/config/scripts/DEBIAN/40-misc
@@ -33,7 +33,7 @@ if [ ! -f $target/etc/machine-id ]; then
     > $target/etc/machine-id
 fi
 # recreate machine-id if the file is empty
-if [ X"$(stat -c '%s' $target/etc/machine-id 2>/dev/null)"  = X0 -a -f /bin/systemd-machine-id-setup ]; then
+if [ X"$(stat -c '%s' $target/etc/machine-id 2>/dev/null)"  = X0 -a -f $target/bin/systemd-machine-id-setup ]; then
     $ROOTCMD systemd-machine-id-setup
 fi
 
@@ -42,8 +42,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