iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug fix
[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..54ca499776933ec6df716178d5e8a1e772c05d6d 100755
(executable)
--- a/
fai/config/scripts/DEBIAN/40-misc
+++ b/
fai/config/scripts/DEBIAN/40-misc
@@
-49,7
+49,7
@@
if [ ! -f $target/etc/machine-id ]; then
> $target/etc/machine-id
fi
# recreate machine-id if the file is empty
> $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
$ROOTCMD systemd-machine-id-setup
fi
@@
-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
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
fi
fcopy -iv /etc/rc.local