arch use by-id and various fixes

[automated-distro-installer] / fai-redep

diff --git a/fai-redep b/fai-redep
index 4ca3ea52b628df6fed6b6f86ae3151bc1fbd4995..6a47fafc7cd1d83044d9ac3e85fe8da8eeee2048 100755 (executable)
--- a/fai-redep
+++ b/fai-redep
@@ -20,10 +20,10 @@ scp -r fai/config root@faiserver:/srv/fai
 # On arch, best seems to be copy your shadow file to a temp location,
 # then passwd, get out the new pass, then copy the shadow file back.
 
-if [[ -e /q/root/shadow/standard ]]; then
-    # note, it would be best to have some kind of security on this file
+f=/q/root/shadow/standard
+if s test -e $f; then
     ssh root@faiserver tee -a /srv/fai/config/class/DEFAULT.var <<EOF
-ROOTPW='$(cat /q/root/shadow/standard)'
+ROOTPW='$(s cat $f)'
 EOF
 fi
 
@@ -34,7 +34,13 @@ EOF
 
 scp ~/.ssh/id_rsa.pub \
     root@faiserver:/srv/fai/config/files/home/ian/.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/traci{,-simple} \
   root@faiserver:/srv/fai/config/distro-install-common
 scp /a/bin/devbyid root@faiserver:/srv/fai/nfsroot/usr/local/bin
-ssh root@faiserver chmod -R a+rX /srv/fai/config/distro-install-common
+ssh root@faiserver bash <<'EOF'
+set -eE -o pipefail
+chmod 644 /srv/fai/config/files/home/ian/.ssh/authorized_keys/GRUB_PC
+chmod -R a+rX /srv/fai/config/distro-install-common
+EOF