misc fixes and improvements

[distro-setup] / brc2

diff --git a/brc2 b/brc2
index af437b337aadb2cbbd1da504d237f4427fea8f87..6f0d016b935c58b2dd6a4605097317ca893fd6dc 100644 (file)
--- a/brc2
+++ b/brc2
@@ -35,7 +35,6 @@ esac
 # generated instead of dynamic for the benefit of shellcheck
 #for x in /a/bin/distro-functions/src/* /a/bin/!(githtml)/*-function?(s); do echo source $x ; done
 source /a/bin/distro-functions/src/identify-distros
-source /a/bin/distro-functions/src/package-manager-abstractions
 source /a/bin/log-quiet/logq-function
 # for x in /a/bin/bash_unpublished/source-!(.#*); do echo source $x; done
 source /a/bin/bash_unpublished/source-semi-priv
@@ -427,12 +426,12 @@ lipush() {
   # note, i had --delete-excluded, but that deletes all files in --exclude-from on
   # the remote site, which doesn't make sense, so not sure why i had it.
   local p a
-  p=(/a/opt/{emacs-debian10{,-nox},mu,emacs} /a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts})
+  p=(/a/opt/{emacs-debian11{,-nox},mu,emacs} /a/bin /a/exe /a/h /a/c /p/c/machine_specific/vps{,.hosts})
   a="-ahviSAXPH --specials --devices --delete --relative --exclude-from=/p/c/li-rsync-excludes"
   ret=0
   for h in li je bk; do
     m s rsync "$@" $a ${p[@]} /p/c/machine_specific/$h root@$h.b8.nz:/ || ret=$?
-    # only li is debian10
+    # only li is debian11
     p[0]=/a/opt/emacs-ubuntu20.04
     p[1]=/a/opt/emacs-ubuntu20.04-nox
   done
@@ -1019,11 +1018,11 @@ wghole() {
   local host ipsuf umask_orig
   host=$1
   ipsuf=$2
-  mkdir -p /p/c/machine_specific/$host/filesystem/etc/{wireguard,network/interfaces.d}
+  mkdir -p /p/c/machine_specific/$host/filesystem/etc/wireguard
   cd /p/c/machine_specific/$host/filesystem/etc/wireguard
   umask_orig=$(umask)
   umask 0077
-  wg genkey | tee $host-priv.key | wg pubkey > $host-pub.key
+  wg genkey | tee hole-priv.key | wg pubkey > hole-pub.key
   cat >wghole.conf <<EOF
 [Interface]
 # contents hole-priv.key
@@ -1071,7 +1070,9 @@ lom() {
     sudo chown $USER:$USER /mnt/$base
   else
     base=$1
-    sudo umount /mnt/$base
+    if mountpoint /mnt/$base &>/dev/null; then
+      sudo umount /mnt/$base
+    fi
     l=$(sudo cryptsetup status /dev/mapper/$base|sed -rn 's/^\s*device:\s*(.*)/\1/p')
     sudo cryptsetup luksClose /dev/mapper/$base || return 1
     sudo losetup -d $l
@@ -1497,6 +1498,19 @@ trc() {
   TR_AUTH=":$(jq -r .profiles[0].password ~/.config/transmission-remote-gtk/config.json)" transmission-remote transmission.lan -ne "$@"
 }
 
+trysleep() {
+  retries="$1"
+  sleepsecs="$2"
+  shift 2
+  for (( i=0; i < retries - 1; i++ )); do
+    if "$@"; then
+      return 0
+    fi
+    sleep $sleepsecs
+  done
+  "$@"
+}
+
 
 tu() {
   local s
@@ -1541,7 +1555,7 @@ spamnn() {
 }
 unboundbash() {
   m sudo nsenter -t $(systemctl status unbound| sed -n '/^ *Main PID:/s/[^0-9]//gp') -n -m sudo -u $USER -i bash
-  }
+}
 
 mailnncheck() {
   local pid ns mailnn
@@ -1606,6 +1620,80 @@ vpn() {
   sudo systemd-tty-ask-password-agent
 }
 
+# systemctl is-enabled / status / cat says nothing, instead theres
+# some obscure symlink. paths copied from man systemd.unit.
+# possibly also usefull, but incomplete, doesnt show units not loaded in memory:
+# seru list-dependencies --reverse --all UNIT
+sysd-deps() {
+  local f
+  local -a dirs search
+  ngset
+
+  case $1 in
+    u)
+      search=(
+        ~/.config/systemd/user.control/*
+        $XDG_RUNTIME_DIR/systemd/user.control/*
+        $XDG_RUNTIME_DIR/systemd/transient/*
+        $XDG_RUNTIME_DIR/systemd/generator.early/*
+        ~/.config/systemd/user/*
+        /etc/systemd/user/*
+        $XDG_RUNTIME_DIR/systemd/user/*
+        /run/systemd/user/*
+        $XDG_RUNTIME_DIR/systemd/generator/*
+        ~/.local/share/systemd/user/*
+        /usr/lib/systemd/user/*
+        $XDG_RUNTIME_DIR/systemd/generator.late/*
+      )
+      ;;
+    *)
+      search=(
+        /etc/systemd/system.control/*
+        /run/systemd/system.control/*
+        /run/systemd/transient/*
+        /run/systemd/generator.early/*
+        /etc/systemd/system/*
+        /etc/systemd/systemd.attached/*
+        /run/systemd/system/*
+        /run/systemd/systemd.attached/*
+        /run/systemd/generator/*
+        /lib/systemd/system/*
+        /run/systemd/generator.late/*
+      )
+      ;;
+  esac
+  for f in "${search[@]}"; do
+    [[ -d $f ]] || continue
+    case $f in
+      *.requires|*.wants)
+        dirs+=("$f")
+        ;;
+    esac
+  done
+  # dirs is just so we write out the directory names, ls does it when there is 2 or more dirs.
+  case ${#dirs[@]} in
+    1)
+      echo "${dirs[0]}:"
+      ll "${dirs[@]}"
+      ;;
+    0) : ;;
+    *)
+      ll "${dirs[@]}"
+      ;;
+  esac
+  ngreset
+}
+
+fixvpndns() {
+  local link istls
+  read _ link _ istls < <(resolvectl dnsovertls tunfsf)
+  case $istls in
+    yes|no) : ;;
+    *) echo fixvpndns error: unexpected istls value: $istls >&2; return 1 ;;
+  esac
+  s busctl call org.freedesktop.resolve1 /org/freedesktop/resolve1 org.freedesktop.resolve1.Manager SetLinkDNSOverTLS is $link no
+}
+
 vpnoff() {
   [[ $1 ]] || { echo need arg; return 1; }
   if [[ -e /lib/systemd/system/openvpn-client@.service ]]; then
@@ -1616,10 +1704,10 @@ vpnoff() {
   sudo systemctl stop $vpn_service@$1
 }
 vpnoffc() { # vpn off client
-  ser stop openvpn-nn@client
+  ser stop openvpn-client-tr@client
 }
 vpnc() {
-  ser start openvpn-nn@client
+  ser start openvpn-client-tr@client
 }