X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-redep;h=ca8fb6096bff0dd8bc4c7d8102dda78ba348ee07;hb=3f252d6d03ae2a7c85e852d5ebe24ac59a4dcd25;hp=2f59ef7ff728f11be9f12a9b2afdcfab2c7f257b;hpb=ec9227898fa68bd89de454c87bce8ea051a8d783;p=automated-distro-installer

diff --git a/fai-redep b/fai-redep
index 2f59ef7..ca8fb60 100755
--- a/fai-redep
+++ b/fai-redep
@@ -32,20 +32,21 @@ faiserver_host=$(chost faiserver) || faiserver_host=faiserver
 
 shopt -s extglob
 ssh root@$faiserver_host rm -rf /srv/fai/config/!(basefiles)
-scp -r fai/config root@$faiserver_host:/srv/fai
+scp -qr fai/config root@$faiserver_host:/srv/fai
 
 
-scp ~/.ssh/id_rsa.pub \
+scp -q ~/.ssh/id_rsa.pub \
     root@$faiserver_host:/srv/fai/config/files/root/.ssh/authorized_keys/GRUB_PC
 # todo: automatically disable faiserver after a period so
 # these files are not exposed.
-s scp -r /q/root/luks /q/root/shadow \
+s scp -qr /q/root/luks /q/root/shadow \
   root@$faiserver_host:/srv/fai/config/distro-install-common
-scp /a/bin/devbyid root@$faiserver_host:/srv/fai/nfsroot/usr/local/bin
-# built this with mk-basefile -J BELENOS64. it's stored in it's own repo which
-# is published alongside this one called fai-basefiles due
-# to being a large binary file.
-scp /a/bin/fai-basefiles/BELENOS64.tar.xz root@$faiserver_host:/srv/fai/config/basefiles
+scp -q /a/bin/fai/devbyid root@$faiserver_host:/srv/fai/nfsroot/usr/local/bin
+
+# built BELANOS basefile with mk-basefile -J BELENOS64. it's stored in
+# it's own repo which is published alongside this one called
+# fai-basefiles due to being a large binary file.
+scp -q /a/bin/fai-basefiles/*.tar.xz root@$faiserver_host:/srv/fai/config/basefiles
 ssh root@$faiserver_host bash <<'EOF'
 set -eE -o pipefail
 set -x
@@ -58,7 +59,9 @@ sed -ri 's,^ *(TFTP_DIRECTORY=).*,\1"/srv/tftp/fai",' /etc/default/tftpd-hpa
 systemctl restart tftpd-hpa
 chmod 644 /srv/fai/config/files/root/.ssh/authorized_keys/GRUB_PC
 chmod -R a+rX /srv/fai/config/distro-install-common
-cd /srv/fai/config/basefiles
-u=http://fai-project.org/download/basefiles/XENIAL64.tar.xz
-wget -nv -N $u
+# this basefile has tar acls bug, so I'm using my own
+# local one for now.
+#cd /srv/fai/config/basefiles
+#u=http://fai-project.org/download/basefiles/XENIAL64.tar.xz
+#wget -nv -N $u
 EOF