X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-redep;h=b035ef55a74283163b544f8d58b78f0b89c0121e;hb=a018c3030b0ebd751d5667efd96c2fd32f2423e0;hp=df867086c5809f962070188bf408b04888cd2c58;hpb=1b26da151c100d0c58910228d24ee52297da3974;p=automated-distro-installer

diff --git a/fai-redep b/fai-redep
index df86708..b035ef5 100755
--- a/fai-redep
+++ b/fai-redep
@@ -41,7 +41,12 @@ scp -q ~/.ssh/id_rsa.pub \
 # these files are not exposed.
 s scp -qr /q/root/luks /q/root/shadow \
   root@$faiserver_host:/srv/fai/config/distro-install-common
-scp -q /a/bin/devbyid root@$faiserver_host:/srv/fai/nfsroot/usr/local/bin
+
+# should tar ssh all the files, but these ones really justified it
+tar -cz /p/c/machine_specific/*/filesystem/etc/ssh | \
+  ssh root@$faiserver_host tar -xz -C /srv/fai/config/distro-install-common
+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
@@ -59,7 +64,11 @@ 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
+
+faiserver-enable