From e0b34d32f5cc83e960188387a9c9a9af071fecb2 Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Sun, 16 Jun 2024 20:11:44 -0400
Subject: [PATCH] minor fixes

---
 fai/config/package_config/UBUNTU.gpg | Bin 0 -> 369 bytes
 wrt-setup                            |  10 +++++-----
 wrt-setup-local                      |   4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 fai/config/package_config/UBUNTU.gpg

diff --git a/fai/config/package_config/UBUNTU.gpg b/fai/config/package_config/UBUNTU.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..544b4af21abd0b077d1df85529d66f060d3833a1
GIT binary patch
literal 369
zcmV-%0gnEdjRaAtc7g!}0Hnpy(*MUjhT#m(Cqgf&im-qMw;3&|$*Mo7E{yr*5gWy#
z*)VfWAZHZQcnE%6urW2^E!^V>$R(r;89A+z;!1W1DaP%c&4zd0l)F0wH8o7Cxy1>6
z)>fah54-tY_n}p$;pXE2ui|q(EylQAlyb<9<KJFuYtjH9d@&Sh4FC}V00FcnOks6y
zV`y+;WFSybK_F&tav)QAb97~GH#Q(dWp-t3Z*Xm8Zghya1QP)Q03rnfQK@!<0viJc
z3ke7Z0|EvW2m%QT3j`Jd0|5da0Rk6*0162Ztkgo$$hUNh)4K!!f_L}0_MgwAA~)GZ
zHK+qooGL#NFlaxN&oV3Ry5R>7Mq<7#E6q_hNL|3qeea>LXj>?g(2(W(&H=ZpCha`#
z02sR;aMh4}=jO$GSA9Vn_(0q{xAqf5P1ZxFFJ{D*|6mrllJH|Nfx%ez;CnVejMwG^
PZ+e0Dk0%5=Kt`1nd{LY4

literal 0
HcmV?d00001

diff --git a/wrt-setup b/wrt-setup
index 1a85864..55de769 100755
--- a/wrt-setup
+++ b/wrt-setup
@@ -38,11 +38,11 @@ bash, we can use ${@@Q} to properly pass an empty var.
 
 
 Note, if we dont have internet yet, then just download the bash package,
-scp it over manually and install it, eg:
+rsync it over manually and install it, eg:
 
 cat /etc/opkg/distfeeds.conf
 wget https://librecmc.org/librecmc/downloads/snapshots/v1.5.1-core/packages/mips_24kc/packages/bash_5.0-3_mips_24kc.ipk
-scp bash_5.0-3_mips_24kc.ipk wrt:
+rsync bash_5.0-3_mips_24kc.ipk wrt:
 ssh wrt
 opkg install /root/bash_5.0-3_mips_24kc.ipk
 EOF
@@ -73,13 +73,13 @@ fi
 echo "$0: h=$h"
 # todo: ecdsa key not working with dropbear
 cat ~/.ssh/{h,hrsa,home}.pub | ssh $h dd of=/etc/dropbear/authorized_keys
-scp /a/work/libremanage/libremanage /a/bin/fai/wrt-init /a/bin/fai/wrt-setup-local /a/bin/fai/dnsmasq-end-lease /a/bin/cedit/cedit $h:/usr/bin
+rsync /a/work/libremanage/libremanage /a/bin/fai/wrt-init /a/bin/fai/wrt-setup-local /a/bin/fai/dnsmasq-end-lease /a/bin/cedit/cedit $h:/usr/bin
 # relay is built for openwrt 18.06.2, r7676-cddd7b4c77
 
 #/a/opt/openwrt/source/bin/packages/mips_24kc/mypackages/relay_1.0-1_mips_24kc.ipk \
 
-scp /q/root/shadow/router /p/c/machine_specific/wrt/etc/dropbear/dropbear_rsa_host_key \
+rsync /q/root/shadow/router /p/c/machine_specific/wrt/etc/dropbear/dropbear_rsa_host_key \
      /p/router-secrets /p/c/machine_specific/wrt/etc/wg.{key,psk}  /p/c/{ptr,dnsmasq,cmc-firewall}-data /b/bash-bear-trap/bash-bear $h:
-scp ../openwrtkeyring/usign/* $h:/etc/opkg/keys
+rsync ../openwrtkeyring/usign/* $h:/etc/opkg/keys
 
 ssh $h wrt-init ${HOME_DOMAIN:-b8.nz} "$@"
diff --git a/wrt-setup-local b/wrt-setup-local
index d18d798..c78fd90 100755
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -793,7 +793,7 @@ config redirect
  option src              wan
  option src_dport        80
  option dest             lan
- option dest_ip          $l.9
+ option dest_ip          $l.3
  option proto            tcp
 config rule
  option src              wan
@@ -806,7 +806,7 @@ config redirect
  option src              wan
  option src_dport        443
  option dest             lan
- option dest_ip          $l.9
+ option dest_ip          $l.3
  option proto            tcp
 config rule
  option src              wan
-- 
2.30.2