minor updates

diff --git a/fai-redep b/fai-redep
index 4269aa3d7b1b137a0abc7406b0aeb163f0b758b4..dc134894dcdcc4b2c83840037861dfbf679ca378 100755 (executable)
--- a/fai-redep
+++ b/fai-redep
@@ -111,7 +111,7 @@ fi
 pall+=($(/a/bin/buildscripts/emacs -p; /a/bin/distro-setup/distro-pkgs $distro))
 
 printf "%s\n%s\n" "PACKAGES install" ${pall[*]} | \
-  $faiserver_shell dd of=/srv/fai/config/package_config/DESKTOP 2>/dev/null ||: # broken pipe
+  $faiserver_shell dd of=/srv/fai/config/package_config/DESKTOP status=none ||: # broken pipe
 
 
 rsync -rplt --include '/*.gz' --exclude '/**' --delete-excluded $BASEFILE_DIR/ "${rpre[@]}"/srv/fai/config/basefiles/

diff --git a/fai/config/files/root/fai-check/VOL_BULLSEYE_BOOTSTRAP b/fai/config/files/root/fai-check/VOL_BULLSEYE_BOOTSTRAP
index a2502387eddd999baeb483bff6fa252aee78e53e..34f682f10dae8c358843a2a3cb4371d4f8fa7567 100755 (executable)
--- a/fai/config/files/root/fai-check/VOL_BULLSEYE_BOOTSTRAP
+++ b/fai/config/files/root/fai-check/VOL_BULLSEYE_BOOTSTRAP
@@ -59,7 +59,13 @@ if $force; then
   exit
 fi
 
-if ! dmidecode -t system | grep -F "Version: ThinkPad X200" &>/dev/null; then
+# on one machine, I could do this:
+# dmidecode -t system | grep -F "Version: ThinkPad X200"
+# however, on another, the version field just says invalid data.
+# todo: figure out some better way to check if we are on
+# an x200.
+
+if ! dmidecode | grep -i thinkpad &>/dev/null; then
   echo "not x200, exiting"
   exit 0
 fi

diff --git a/wrt-setup b/wrt-setup
index 157dface0b473b3c13d929afb1c09d51bd4f55b7..33d8f38ee2a700f0243e62f724d9d3da960b37e6 100755 (executable)
--- a/wrt-setup
+++ b/wrt-setup
@@ -70,7 +70,7 @@ 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 2>/dev/null
+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/cedit/cedit $h:/usr/bin
 # relay is built for openwrt 18.06.2, r7676-cddd7b4c77
 

diff --git a/wrt-setup-local b/wrt-setup-local
index 9713ada97dea2c74d6971314e15fc913539483f6..6e917f6370faff696e0a48bdacc94a4a0d4d28f8 100755 (executable)
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -741,16 +741,16 @@ config rule
 
 
 config redirect
- option name sshkd
+ option name sshfrodo
  option src              wan
- option src_dport        2202
+ option src_dport        2228
  option dest_port        22
- option dest_ip          $l.2
+ option dest_ip          $l.28
  option dest             lan
 config rule
  option src              wan
  option target           ACCEPT
- option dest_port        2202
+ option dest_port        2228
 
 
 config redirect
@@ -1088,11 +1088,20 @@ forward-zone:
   name: "."
 #  forward-addr: 8.8.8.8
 #  forward-addr: 8.8.8.8
+
+# ssl disabled due to this error:
+#Sat Dec 24 03:34:44 2022 daemon.err unbound: [6568:0] error: ssl handshake failed crypto error:1416F086:SSL routines:tls_process_server_certificate:certificate verify failed
+#Sat Dec 24 03:34:44 2022 daemon.notice unbound: [6568:0] notice: ssl handshake failed 1.0.0.3 port 853
+# on OPENWRT_RELEASE="OpenWrt SNAPSHOT r18639-f5865452ac"
+# from about feb 2022
+
 # https://developers.cloudflare.com/1.1.1.1/1.1.1.1-for-families/setup-instructions/dns-over-https
-  forward-addr: 1.1.1.3@853#family.cloudflare-dns.com
-  forward-addr: 1.0.0.3@853#family.cloudflare-dns.com
-  forward-ssl-upstream: yes
+#  forward-addr: 1.1.1.3@853#family.cloudflare-dns.com
+#  forward-addr: 1.0.0.3@853#family.cloudflare-dns.com
+#  forward-ssl-upstream: yes
   forward-first: no
+  forward-addr: 1.1.1.3
+  forward-addr: 1.0.0.3
 
 view:
   name: "youtube"
@@ -1231,7 +1240,7 @@ dhcp-host=00:1b:a9:8c:a8:23,set:brother,$l.19,brother
 dhcp-host=00:26:b6:f7:d4:d8,set:amyw,$l.23,amyw
 dhcp-host=9a:c6:52:6f:ce:7c,set:onep9,$l.24,onep9
 dhcp-host=38:63:bb:07:5a:f9,set:hp,$l.25,hp
-dhcp-host=00:26:18:97:bb:16,set:frodo,$l.28,frodo
+dhcp-host=14:dd:a9:d5:31:7a,set:frodo,$l.28,frodo
 #dhcp-host=00:26:b6:f6:0f:e9,set:frodow,$l.28,frodow
 dhcp-host=70:a6:cc:3a:bb:b4,set:bow,$l.29,bow
 dhcp-host=6c:56:97:88:7b:74,set:amazontab,$l.31,amazontab