lots of fixes, automation for bitfolk

[distro-setup] / bitfolk-rescue-init

diff --git a/bitfolk-rescue-init b/bitfolk-rescue-init
index 9ff0a30d9ed011f5b1d8f1f975e1da406073c578..938f0f236caf4c07f85a91beea96b67568a1da60 100644 (file)
--- a/bitfolk-rescue-init
+++ b/bitfolk-rescue-init
@@ -8,35 +8,44 @@ ssh iankelling@iankelling.console.bitfolk.com
 
 destroy
 rescue
+
 sudo -i
 mkdir -p /root/.ssh
 chmod 700 /root/.ssh
 cat >/root/.ssh/authorized_keys <<'EOF'
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDX42yru/h6r6UDRy/VwVZjcYEmNLG5/SUjv7xwu43OaW0wL+uHYg2rkfn4Ygh5o1I5pgBh2SWg8TeWuVGhgL1SCuBzzeai/+58Sny065Qak+D2WjVOuRonRelh+CBA5EpNZPuiWQkoWdf9NACTBCbS2Zu7r8OOgRqu/ruaDNePlG5+U0Wlpy3oBnpbzQiuSA3AKMW30fsCJtOBjz5qQaiPbYEKJy3AOvtbq10wliKx9TpsTzrq8dKWs7PLhZnzqVCsaq6D95IzjqXcSpx4Cga5bn+YEuAnJQ53PGA5eO+hpz6HDmawTbJlaV/Dufb9bJ/ZZy1DXzs07yWRtTEY54/X ian@iankelling.org
 EOF
+
 apt update
-apt -y install openssh-server
+if [[ -e /usr/sbin/sshd ]]; then
+  systemctl restart ssh
+else
+  apt -y install openssh-server
+fi
 
 
 ##### in another terminal ######
 
-host=je
-scp /b/ds/bitfolk* root@$host.b8.nz:
-ssh root@$host ./bitfolk-rescue-install $host
+h=bk
+
+scp -pr --chown=root:root /p/c/machine_specific/$h/filesystem/etc/ssh/ root@$h.b8.nz:/etc/ssh
+
+scp /b/ds/bitfolk* root@$h.b8.nz:
+
+# initially saved via:
+# mkc /p/c/machine_specific/$h/filesystem/etc/ssh/
+# rsync -a root@$h:/etc/ssh/ssh_host* .
+ssh root@$h ./bitfolk-rescue-install $h
 
 ### back to the 1st terminal
 
-poweroff
 boot
 
-# press ctrl ]
+# after boot, press ctrl ]
 exit
 
-jepush
-# todo: lets copy the host keys around so we dont have to do this.
-khfix je
-sl root@je /a/bin/ds/distro-begin
+h=bk
+${h}push
+sl root@$h /a/bin/ds/distro-begin
 
-# todo, fix it so i can ssh to
-sl je /a/bin/ds/distro-begin
-sl je /a/bin/ds/distro-end
+sl $h /a/bin/ds/dall