main fai scripts can run outside of fai, fixup stuff

[automated-distro-installer] / arch-init-remote

diff --git a/arch-init-remote b/arch-init-remote
index 4210b5f8ce86f83ba73924372147232302a5e3aa..13f0bcd41d2f1b1d283d873ba4a48648a5667ae5 100755 (executable)
--- a/arch-init-remote
+++ b/arch-init-remote
@@ -11,6 +11,7 @@ if [[ ! $1 ]]; then
 fi
 host=$1
 
+
 scp -o StrictHostKeyChecking=false -o UserKnownHostsFile=/dev/null \
     /p/c/machine_specific/$host/filesystem/etc/ssh/* root@$host:/etc/ssh
 
@@ -19,22 +20,15 @@ if [[ -e  /var/cache/pacman/pkg ]]; then
     mirror=http://$HOSTNAME:8080
 fi
 faid=/a/bin/fai
-fai_files=(
-    distro-install-common
-    hooks/partition.DEFAULT
-    class/50-host-classes
-
-)
-sudo scp -r /a/bin/fai/arch-init{,-chroot} \
-     /a/bin/fai/encrypt \
-     ${fai_files[@]/#//a/bin/fai/fai/config/} \
-     /a/bin/devbyid \
-     /q/root/luks /q/root/shadow root@$host:
+
+rsync -rlpthvi --relative /a/bin/fai/ root@$host:/
+rsync /a/bin/fai/ root@$host:/a/bin/fai/
+sudo scp -r /a/bin/devbyid /q/root/luks /q/root/shadow root@$host:
 # creating shadow file string:
 # on debian, you can use mkpasswd -m sha-512 to generate a pass.
 # arch doesn't have this program. instead, you can do passwd,
 # and extract it from the shadow file.
-ssh root@$host bash -x ./arch-init $host $mirror
+ssh root@$host bash -x /a/bin/fai/arch-init $host $mirror
 
 #ssh root@$host reboot now || [[ $? == 255 ]]