X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-redep;h=4269aa3d7b1b137a0abc7406b0aeb163f0b758b4;hb=ceeb4e46d3bb326d01fcc7ed98d94ab0b580eda3;hp=924e8b7e54dd6be0747699f28133394140f13640;hpb=14f283f82afc48d6cec1bb7498ec34ac2b0da77c;p=automated-distro-installer

diff --git a/fai-redep b/fai-redep
index 924e8b7..4269aa3 100755
--- a/fai-redep
+++ b/fai-redep
@@ -59,7 +59,8 @@ m() { printf "$pre %s\n"  "$*"; "$@"; }
 # i use faiserver as a dns alias, but ssh key is associated with
 # a canonical hostname and we will have ssh warning spam unless we
 # use it, so look it up just to avoid the warning spam.
-faiserver_host=$(/a/exe/chost $host) || faiserver_host=$host
+faiserver_host=$(/a/exe/chost $host)
+#  faiserver_host=$host
 
 faiserver_addr=$(host $host | sed -rn 's/^\S+ has address //p;T;q' ||:)
 if ! ip a | grep "^ *inet.\? $faiserver_addr" &>/dev/null; then
@@ -72,7 +73,6 @@ rsync -atL /home/iank/.ssh/authorized_keys fai/config/files/root/.ssh/authorized
 # we hssh and ssh_filter_btrbk for the initial btrbk (alternatively, I could open up the
 # permissions in authorized_keys, but that just seems lazy)
 install --owner=iank --group=iank -d fai/config/files/usr/local/bin/hssh
-rsync -atL /a/bin/ds/hssh fai/config/files/usr/local/bin/hssh/STANDARD
 install --owner=iank --group=iank -d fai/config/files/usr/local/bin/ssh_filter_btrbk.sh
 rsync -atL /a/opt/btrbk/ssh_filter_btrbk.sh fai/config/files/usr/local/bin/ssh_filter_btrbk.sh/STANDARD