From 8f88f097528c2450b77a5fe061141af5e277fa82 Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Sat, 27 Jul 2024 05:57:51 -0400
Subject: [PATCH] minor fixes and config changes

---
 fai/config/debconf/DEBIAN                         |  1 +
 .../install-mainline-kernel-debs                  |  3 +++
 fai/config/hooks/partition.DEFAULT                | 14 +++++++-------
 fai/config/scripts/IANK/11-iank                   | 15 +++++++++++----
 wrt-setup-local                                   | 14 ++++++++++++++
 5 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/fai/config/debconf/DEBIAN b/fai/config/debconf/DEBIAN
index 23fc31b..29f86b8 100644
--- a/fai/config/debconf/DEBIAN
+++ b/fai/config/debconf/DEBIAN
@@ -6,4 +6,5 @@ keyboard-configuration  keyboard-configuration/xkb-keymap       select us
 keyboard-configuration  keyboard-configuration/variant  select USA
 keyboard-configuration  keyboard-configuration/model    select Generic 105-key (Intl) PC
 keyboard-configuration  keyboard-configuration/layoutcode       string us
+# this ends up in /etc/vconsole.conf
 keyboard-configuration  keyboard-configuration/optionscode      string terminate:ctrl_alt_bksp
diff --git a/fai/config/distro-install-common/install-mainline-kernel-debs b/fai/config/distro-install-common/install-mainline-kernel-debs
index aaee5eb..82cd5f3 100755
--- a/fai/config/distro-install-common/install-mainline-kernel-debs
+++ b/fai/config/distro-install-common/install-mainline-kernel-debs
@@ -16,6 +16,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+
+# note: currently unused.
+
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
diff --git a/fai/config/hooks/partition.DEFAULT b/fai/config/hooks/partition.DEFAULT
index 36f858c..38488e9 100755
--- a/fai/config/hooks/partition.DEFAULT
+++ b/fai/config/hooks/partition.DEFAULT
@@ -244,13 +244,13 @@ dev-mib() {
 luks-setup() {
   local luksdev="$1"
   local cryptname="$2"
-  # when we move to newer than trisquel 9, we can remove
-  # --type luks1. We can also check on cryptsetup --help | less /compil
-  # to see about the other settings. Default in debian 9 is luks2.
-  # You can convert from luks2 to luks 1 by adding a temporary key:
-  # cryptsetup luksAddKey --pbkdf pbkdf2
-  # then remove the new format keys with cryptsetup luksRemoveKey
-  # then cryptsetup convert DEV --type luks1, then readd old keys and remove temp.
+  # when we move to newer than trisquel 9, we can remove --type
+  # luks1. We can also check on cryptsetup --help | less /compil to see
+  # about the other settings. Default in debian 9 is luks2.  You can
+  # convert from luks2 to luks 1 by adding a temporary key: cryptsetup
+  # luksAddKey --pbkdf pbkdf2 then remove the new format keys with
+  # cryptsetup luksRemoveKey then cryptsetup convert DEV --type luks1,
+  # then readd old keys and remove temp.
   yes YES | cryptsetup luksFormat $luksdev $luks_file || [[ $? == 141 ]]
   yes "$lukspw" | \
     cryptsetup luksAddKey --key-file $luks_file \
diff --git a/fai/config/scripts/IANK/11-iank b/fai/config/scripts/IANK/11-iank
index 25c0503..ec50ff7 100755
--- a/fai/config/scripts/IANK/11-iank
+++ b/fai/config/scripts/IANK/11-iank
@@ -363,9 +363,8 @@ done
 ## begin get new kernel and btrfs-progs ##
 case $HOSTNAME in
   sy|so)
-    # on sy t11, severe wifi degredation on 6.8
-    # on so t11, no x11 display on 6.8
-    $FAI/distro-install-common/install-mainline-kernel-debs stable
+    # note, on sy t11, severe wifi degredation on mainline 6.8
+    :
     ;;
   *)
     if ! $ROOTCMD dpkg -s -- freesh-archive-keyring  2>&1 | grep -Fx "Status: install ok installed" &>/dev/null; then
@@ -396,7 +395,15 @@ if [[ $ver != "$cur_ver" ]]; then
     cd $target/tmp
     wget $url
     tar xzf $tarball
-    $ROOTCMD apt-get -y build-dep btrfs-progs
+    # if we are in a full install, gotta prevent build-dep from
+    # using repos that are pinned negative, and pulling in uninstallable
+    # packages.
+    if [[ -e /b/distro-functions/src/package-manager-abstractions ]]; then
+      . /b/distro-functions/src/package-manager-abstractions
+      pbuild-dep btrfs-progs -y
+    else
+      $ROOTCMD apt-get -y build-dep btrfs-progs
+    fi
     # no docs cuz I didn't want to bother fixing error of missing docs dependencies
     $ROOTCMD bash -xe <<EOF
 cd /tmp/${tarball%.tar.gz}
diff --git a/wrt-setup-local b/wrt-setup-local
index 11c9327..0eb3e79 100755
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -651,6 +651,20 @@ config rule
  option proto            tcp
 
 
+config redirect
+ option name temp_webserver
+ option src              wan
+ option src_dport        8877
+ option dest             lan
+ option dest_ip          $l.38
+ option proto            tcp
+config rule
+ option src              wan
+ option target           ACCEPT
+ option dest_port        8877
+ option proto            tcp
+
+
 ## begin no external dns for ziva
 config rule
  option src  lan
-- 
2.30.2