various fixes and initial focal support

[automated-distro-installer] / wrt-setup

diff --git a/wrt-setup b/wrt-setup
index e6e5f284509e5999e58cabe217ef497cf6f595f1..3c572f29b3ef49f95a92ea277e2a01d746ea26b8 100755 (executable)
--- a/wrt-setup
+++ b/wrt-setup
@@ -59,7 +59,8 @@ cat ~/.ssh/home.pub | ssh $h dd of=/etc/dropbear/authorized_keys 2>/dev/null
 scp /a/work/libremanage/libremanage /a/bin/fai/wrt-setup-local /a/bin/cedit/cedit $h:/usr/bin
 # relay is built for openwrt 18.06.2, r7676-cddd7b4c77
 sudo scp /q/root/shadow/router /p/c/machine_specific/wrt/etc/dropbear/dropbear_rsa_host_key \
-     /a/opt/openwrt/source/bin/packages/mips_24kc/mypackages/relay_1.0-1_mips_24kc.ipk $h:
+     /a/opt/openwrt/source/bin/packages/mips_24kc/mypackages/relay_1.0-1_mips_24kc.ipk \
+     /p/c/machine_specific/wrt/etc/wg.{key,psk} $h:
 scp ../openwrtkeyring/usign/* $h:/etc/opkg/keys
 
 ssh $h <<EOFOUTER