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
minor improvements
[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..e52ebe9c8a4ad4749fa168f04085c0d5e9344311 100755
(executable)
--- a/
fai/config/scripts/DEBIAN/40-misc
+++ b/
fai/config/scripts/DEBIAN/40-misc
@@
-32,16
+32,16
@@
if [ ! -e $target/etc/adjtime ]; then
printf "0.0 0 0.0\n0\nUTC\n" > $target/etc/adjtime
fi
if [ "$UTC" = "yes" ]; then
printf "0.0 0 0.0\n0\nUTC\n" > $target/etc/adjtime
fi
if [ "$UTC" = "yes" ]; then
-
sed -i -e 's:^LOCAL$:UTC:' $target
/etc/adjtime
+
fai-sed 's:^LOCAL$:UTC:'
/etc/adjtime
else
else
-
sed -i -e 's:^UTC$:LOCAL:' $target
/etc/adjtime
+
fai-sed 's:^UTC$:LOCAL:'
/etc/adjtime
fi
# enable linuxlogo
if [ -f $target/etc/inittab ]; then
fi
# enable linuxlogo
if [ -f $target/etc/inittab ]; then
-
sed -i -e 's#/sbin/getty 38400#/sbin/getty -f /etc/issue.linuxlogo 38400#' ${target}
/etc/inittab
+
fai-sed 's#/sbin/getty 38400#/sbin/getty -f /etc/issue.linuxlogo 38400#'
/etc/inittab
elif [ -f $target/lib/systemd/system/getty@.service ]; then
elif [ -f $target/lib/systemd/system/getty@.service ]; then
-
sed -i -e 's#sbin/agetty --noclear#sbin/agetty -f /etc/issue.linuxlogo --noclear#' $target
/lib/systemd/system/getty@.service
+
fai-sed 's#sbin/agetty --noclear#sbin/agetty -f /etc/issue.linuxlogo --noclear#'
/lib/systemd/system/getty@.service
fi
# make sure a machine-id exists
fi
# make sure a machine-id exists
@@
-49,17
+49,18
@@
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
-ln -fs /proc/mounts $target/etc/mtab
+fai-link /etc/mtab ../proc/self/mounts
-rm -f $target/etc/dpkg/dpkg.cfg.d/
fai $target/etc/dpkg/dpkg.cfg.d/
unsafe-io
+rm -f $target/etc/dpkg/dpkg.cfg.d/unsafe-io
if [ -d /etc/fai ]; then
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