avoid future errors with overwriting symlnks

[automated-distro-installer] / faiserver-setup

diff --git a/faiserver-setup b/faiserver-setup
index 0510b407a4a9117d4ea5c060104dc2d0696335a0..b9b6d74c8d535e25d691999154d478666137b176 100755 (executable)
--- a/faiserver-setup
+++ b/faiserver-setup
@@ -34,12 +34,13 @@ if [[ $to_install ]]; then
     apt-get -y install ${to_install[@]}
 fi
 
-sed -i 's/^#deb/deb/' /etc/fai/apt/sources.list
-sed -i 's/#LOGUSER/LOGUSER/' /etc/fai/fai.conf
+sed="sed -ri --follow-symlinks"
+$sed 's/^#deb/deb/' /etc/fai/apt/sources.list
+$sed 's/#LOGUSER/LOGUSER/' /etc/fai/fai.conf
 # from man fai-make-nfsroot,
 # figured out after partitioning ignored my crypt partition
 if ! grep cryptsetup /etc/fai/NFSROOT &>/dev/null; then
-    sed -ri '/^PACKAGES install$/a cryptsetup' /etc/fai/NFSROOT
+    $sed '/^PACKAGES install$/a cryptsetup' /etc/fai/NFSROOT
 fi
 fai-setup -vf
 { head -n 1 /srv/fai/nfsroot/root/.ssh/known_hosts | awk '{print $1}' \
@@ -47,7 +48,7 @@ fai-setup -vf
     } >>/srv/fai/nfsroot/root/.ssh/known_hosts
 
 # this does not alter the config on a new install
-sed -ri 's#^([[:space:]]*TFTP_DIRECTORY[[:space:]]*=).*#\1"/srv/tftp"#' \
+$sed 's#^([[:space:]]*TFTP_DIRECTORY[[:space:]]*=).*#\1"/srv/tftp"#' \
     /etc/default/tftpd-hpa
 
 service tftpd-hpa restart
@@ -93,6 +94,6 @@ apt-get -y install apt-cacher-ng
 # the logsave prompted because the hostname faiserver was uknown.
 # Here it was faiserver.lan when running from a faiserver vm.
 # When running from a normal host with faiserver alias, it was the normal hosts name.
-sed -ri 's/(^[^,]+,)\S+/\1faiserver/' /srv/fai/nfsroot/root/.ssh/known_hosts
+$sed 's/(^[^,]+,)\S+/\1faiserver/' /srv/fai/nfsroot/root/.ssh/known_hosts
 # ditch the logo banner up top which screws with less.
 touch /srv/fai/nfsroot/.nocolorlogo