annoying fixes

diff --git a/brc b/brc
index 05a44b5495e723e2d9817157e871ed7f4f7564ed..2f88b8a02cd72aeca17f0a9a94233319ce6cc9dc 100644 (file)
--- a/brc
+++ b/brc
@@ -3995,6 +3995,7 @@ if [[ $- == *i* ]]; then
   # so I've thrown a bunch of things at the wall to speed it up.
   prompt-command() {
     local return=$? # this MUST COME FIRST
+    local h
     local jobs_char
 
     PS1='\w'
@@ -4029,7 +4030,10 @@ if [[ $- == *i* ]]; then
       # save history. if our filesystem went read-only or something, continue on
       if history -a; then
         if [[ $SSH_CLIENT && $NOT_MAIL_HOST_P == t ]]; then
-          history 1 | sed -r 's/^([^ ]+ +){4}//' |  nc -N localhost 36660 ||:
+          h="$(history 1)"
+          if [[ $h ]]; then
+            sed -r 's/^([^ ]+ +){4}//' <<<"$h" |  nc -w 1 -N localhost 36660 ||:
+          fi
         fi
       fi
 

diff --git a/brc2 b/brc2
index 0268d26b5596b2471c5520eb1178a13e62dd60d0..2812415957188d3bfeb5e4178524eccda70646d6 100644 (file)
--- a/brc2
+++ b/brc2
@@ -2282,8 +2282,8 @@ Description=Initial setup of netns for wg-quick-tr %I
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns -n 10.174.$ipsuf start %i
-ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns stop %i
+ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns -n 10.174.$ipsuf start %i
+ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns stop %i
 RemainAfterExit=yes
 
 [Install]
@@ -3973,8 +3973,9 @@ um() {
   m pactl set-sink-mute @DEFAULT_SINK@ false
   rm -f /tmp/ianknap
 }
+unmute() { um "$@"; }
 
-nap() {
+mute() {
   local sink card
   sink=$(pactl get-default-sink)
   card="${sink%.*}"
@@ -4344,6 +4345,18 @@ fi
 # noticably slows bash startup.
 
 
+### persistent pyenv setup. started 2026-02-28
+# git clone https://github.com/pyenv/pyenv.git /a/opt/pyenv
+# mypyenvinit
+# pyenv install 3.13
+# pyenv global 3.13
+# # from pipx install instructions
+# python3 -m pip install --user pipx
+# python3 -m pipx ensurepath
+# # from beets install instructions.
+# # in brackets are nondefault plugins
+# pipx install 'beets[lyrics,discogs,mbsync]'
+
 
 mypyenvinit () {
   if [[ $EUID == 0 || ! -e ~/.pyenv/bin ]]; then

diff --git a/conflink b/conflink
index 1a302b3fc2989c0cc8777cb628c100654f031f10..ca1deae6782a28b4bae8e7263fe0ba8c9651df64 100755 (executable)
--- a/conflink
+++ b/conflink
@@ -359,6 +359,8 @@ case $user in
       fi
     done
 
+    ln -sf /a/opt/pyenv ~/.pyenv
+
     # disabled
     # if [[ -d /var/lib/bitcoind && -d /p/c/user-specific/bitcoin ]]; then
     #   s rsync -clpgoDiSAX --chown=bitcoin:bitcoin /p/c/user-specific/bitcoin/settings.json /var/lib/bitcoind

diff --git a/distro-end b/distro-end
index 9d06ff06bad3005d78fd3d7ea7d9aa0473447def..ee294aac6ad79a12f0c67bc5ec0c3eb0c8e2b5de 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -1772,20 +1772,6 @@ esac
 
 
 
-if [[ ! -d ~/.pyenv/.git ]]; then
-  git clone https://github.com/pyenv/pyenv.git ~/.pyenv
-  . /b/ds/brc2
-  mypyenvinit
-  pyenv install 3.13
-  pyenv global 3.13
-  # from pipx install instructions
-  python3 -m pip install --user pipx
-  python3 -m pipx ensurepath
-  # from beets install instructions.
-  # in brackets are nondefault plugins
-  pipx install 'beets[lyrics,discogs,mbsync]'
-fi
-
 
 ##### end beets #####
 
@@ -2098,6 +2084,11 @@ if [[ ! -e /etc/apt/sources.list.d/pgdg.sources ]]; then
   # when we run it, do:
   #sudo -u postgres createuser -d iank
   sudo usermod -a -G postgres iank
+  if ! out=$(psql -XAtq -Pfieldsep=' ' -vON_ERROR_STOP=on postgres <<<"select 1 from pg_user where usename = 'iank';" 2>/dev/null) || [[ $out != 1 ]]; then
+    sudo -u postgres createuser -d iank
+  fi
+  # initial db creation with:
+  # createdb -O iank db_name
 fi
 
 #####

diff --git a/filesystem/etc/cron.d/ian b/filesystem/etc/cron.d/ian
index 3684db2cdcd834833c00bf627d6659e5c2828239..28470fe728ef5da5ac7199db7d6bd6c5bc41961c 100644 (file)
--- a/filesystem/etc/cron.d/ian
+++ b/filesystem/etc/cron.d/ian
@@ -34,7 +34,7 @@ MAILTO=root
 4 20 * * 5   iank check-lets-encrypt-ssl-settings
 4 21 * * 5   iank auto-commit-changes /a /p
 4 23 * * 5   iank failmail eggdrop-upgrade
-12 22 * * 5   iank failmail /b/bash_unpublished/cron-misc
+12 22 * * *   iank failmail /b/bash_unpublished/cron-misc
 
 
 # avoid dnssec expirations. This is a hack, what we should

diff --git a/filesystem/usr/local/bin/btrbk-run b/filesystem/usr/local/bin/btrbk-run
index 3f2fd62f4e7188f8651f5995b8a62df02b6ce5cc..f4088d4bbcc57f3b1867a266167054bb44880112 100755 (executable)
--- a/filesystem/usr/local/bin/btrbk-run
+++ b/filesystem/usr/local/bin/btrbk-run
@@ -152,7 +152,7 @@ set-location() {
     kd|frodo)
       at_home=true
       ;;
-    x2|x3|sy|so)
+    x2|x3|sy|so|sf)
       laptop=true
       if [[ $(timeout 1 dig +short @10.2.0.1 -x 10.2.0.2 2>&1 ||:) == kd.b8.nz. ]] \
            && ip n show 10.2.0.1 | grep . &>/dev/null; then
@@ -169,7 +169,7 @@ exit-if-no-default-targets() {
     mexit 0
   fi
   case $HOSTNAME in
-    kw|kd|frodo|x2|x3|sy|so) : ;;
+    kw|kd|frodo|x2|x3|sy|so|sf) : ;;
     *)
       die "error: no default targets for this host, use -t"
       ;;
@@ -610,7 +610,7 @@ if $kd_spread; then
   fi
   cmd_arg=resume
   preserve_arg=-p
-  add-wireless-target sy so
+  add-wireless-target sf so
 fi
 
 if [[ ! $cmd_arg ]]; then
@@ -679,9 +679,10 @@ set-location
 if [[ ! -v targets && ! $source ]]; then
   exit-if-no-default-targets
   if $at_home; then
-    if ! $kd_spread && [[ $HOSTNAME != x3 ]]; then
-      add-x3-target
-    fi
+    ## x3 needs reinstall
+    # if ! $kd_spread && [[ $HOSTNAME != x3 ]]; then
+    #   add-x3-target
+    # fi
     if [[ $HOSTNAME != frodo ]]; then
       targets+=(frodo.b8.nz)
     fi
@@ -689,7 +690,7 @@ if [[ ! -v targets && ! $source ]]; then
       targets+=(kd.b8.nz)
     fi
     wireless_home_hosts=(
-      sy
+      sf
       so
     )
     for h in ${wireless_home_hosts[@]}; do
@@ -913,7 +914,7 @@ else
   sshfail=()
   remote_str_cmd="mkdir -p /mnt/root/btrbk /mnt/o/btrbk && \
 date +%z && \
-df --output=size,pcent / | tail -n1"
+df --output=size,pcent /mnt/root | tail -n1"
 
   for h in ${targets[@]}; do
     if $fast || $conf_only; then

diff --git a/filesystem/usr/local/bin/mount-latest-subvol b/filesystem/usr/local/bin/mount-latest-subvol
index aa3798b830f357d2d8e0936c358c839232450b23..bfa79b030f4e268c8a41d64ef564bf11748d34bc 100755 (executable)
--- a/filesystem/usr/local/bin/mount-latest-subvol
+++ b/filesystem/usr/local/bin/mount-latest-subvol
@@ -104,14 +104,13 @@ mnt() {
     fi
   done
 }
-# write piped lines to fstab, wiping out any existing lines that have
+# write piped lines to fstab, unless any existing lines have
 # the same first 2 fields.
 fstab() {
   local mount_source mpoint line_end l
   while read -r mount_source mpoint line_end; do
     l="$mount_source $mpoint $line_end"
-    # kill off any lines that duplicate the mount point.
-    sed --follow-symlinks -ri "\%$l%b;\%^\s*\S+\s+$mpoint\s%d" /etc/fstab
+    if grep -rq "^[[:space:]]*$mount_source[[:space:]]+$mpoint[[:space:]]+" /etc/fstab; then continue; fi
     tu /etc/fstab <<<"$l"
   done
 }
@@ -296,93 +295,6 @@ setup-root2() {
   fi
 }
 
-# Setup fstab for subvols we care about.
-# Input vars: none
-setup-fstab() {
-  local root_dev o_dev crypt_dev mopts dev f fa
-  root_dev=$(awk '$2 == "/mnt/root" {print $1}' /etc/mtab)
-  mapper-dev root_dev
-  o_dev=$(awk '$2 == "/mnt/o" {print $1}' /etc/mtab)
-  mapper-dev o_dev
-
-
-  # root2_dev=$(awk '$2 == "/mnt/root2" {print $1}' /etc/mtab)
-  # mapper-dev root2_dev
-  # # dont bother with the above for crypt2_dev
-  # crypt2_dev=$root2_dev
-
-
-  if cryptsetup status $root_dev &>/dev/null; then
-    crypt_dev=$root_dev
-  else # if we are in a recovery boot, find the next best crypt device
-    mopts=,noauto
-    # todo: I think I had an idea to not setup /o in this case,
-    # but never finished implementing it
-    for dev in $(dmsetup ls --target crypt | awk '{print $1}'); do
-      dev=/dev/mapper/$dev
-      if awk '{print $1}' /etc/mtab | grep -Fx $dev &>/dev/null; then
-        crypt_dev=$dev
-        break
-      fi
-    done
-  fi
-
-  # dont tax the cpus of old laptops
-  if (( $(nproc) > 2)); then
-    mopts+=,compress=zstd
-  fi
-  if grep -qF ,nodiscard,flushoncommit /etc/fstab; then
-    mopts+=,nodiscard,flushoncommit
-  fi
-
-
-  fstab <<EOF
-$crypt_dev  /a  btrfs  noatime,subvol=a$mopts  0 0
-EOF
-
-  # ssh and probably some other things care about parent directory
-  # ownership, and ssh doesn\'t allow any group writable parent
-  # directories, so we are forced to use a directory structure similar
-  # to home directories
-  fa=(/mnt/root/btrbk/q.*); f=${fa[0]}
-  if [[ -e $f ]]; then
-    fstab <<EOF
-$crypt_dev  /q  btrfs  noatime,subvol=q$mopts  0 0
-/q/p  /p  none  bind$mopts  0 0
-EOF
-  fi
-
-  fa=(/mnt/root/btrbk/qr.*); f=${fa[0]}
-  if [[ -e $f ]]; then
-    fstab <<EOF
-$crypt_dev  /qr  btrfs  noatime,subvol=qr$mopts  0 0
-EOF
-  fi
-
-  # not syncing ar at the moment
-  # fa=(/mnt/root/btrbk/ar.*); f=${fa[0]}
-  # if [[ -e $f ]]; then
-  #   fstab <<EOF
-  # $crypt_dev  /ar  btrfs  noatime,subvol=ar$mopts  0 0
-  # EOF
-  # fi
-
-
-  fa=(/mnt/o/btrbk/o.*); f=${fa[0]}
-  if [[ -e $f ]]; then
-    if [[ $o_dev != "$root_dev" ]]; then
-      # ,compress=zstd regardless of mopts since these are all text files
-      # and it cuts disk use by about half.
-      fstab <<EOF
-$o_dev  /o  btrfs  noatime,subvol=o${mopts/,compress=zstd/},compress=zstd  0 0
-EOF
-    fi
-    fstab <<EOF
-/o/m  /m  none  bind$mopts  0 0
-/o/debbugs  /debbugs  none  bind$mopts  0 0
-EOF
-  fi
-}
 
 # Prune from ${all_vols[@]}: vols that have loopback mounts within their
 # mountpoint and vols not in fstab.
@@ -415,6 +327,8 @@ prune-vols() {
       fi
     done
     if $found_loop; then
+      # just check if its stale so we notice it.
+      m check-subvol-stale /$vol
       continue
     fi
     ##### end #####
@@ -589,7 +503,6 @@ mkdir -p /var/log/btrbk
 
 declare -A root_dirs
 
-setup-fstab
 prune-vols
 w mount-mismatch-fix ||:
 plan-umounts

diff --git a/filesystem/usr/local/bin/prof-notify b/filesystem/usr/local/bin/prof-notify
index ef66031af1bba0cd9baf22871186ffd6982e7d9b..42944107f8dd9e6ca38471b2f64e6d84203b55bb 100755 (executable)
--- a/filesystem/usr/local/bin/prof-notify
+++ b/filesystem/usr/local/bin/prof-notify
@@ -27,7 +27,7 @@ pkill -fxA '/bin/bash /usr/local/bin/prof-notify' ||:
 
 
 while true; do
-  read -r line ||:
+  read -r line || sleep 5
   #echo "prof-notify debug line: $line"
 
   # check that the profanity window is not focused

diff --git a/machine_specific/bo/filesystem/etc/systemd/system/wg-quick-tr-pre@.service b/machine_specific/bo/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
index e18702a9ca7b03de96d325b06d6e8cae6bcc4b57..7f228e7a7ceb09f79436bf4cb60e00e43fa4aadb 100644 (file)
--- a/machine_specific/bo/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
+++ b/machine_specific/bo/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
@@ -3,8 +3,8 @@ Description=Initial setup of netns for wg-quick-tr %I
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns -n 10.174.29 start %i
-ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns stop %i
+ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns -n 10.174.29 start %i
+ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns stop %i
 RemainAfterExit=yes
 
 [Install]

diff --git a/machine_specific/frodo/filesystem/etc/btrbk/r5.conf b/machine_specific/frodo/filesystem/etc/btrbk/r5.conf
index 31b11542be3c1def32ff7ccd00976d809d2c9e72..3689b26316d383bd9cbeb9fdb9bb288b760430d9 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/btrbk/r5.conf
+++ b/machine_specific/frodo/filesystem/etc/btrbk/r5.conf
@@ -16,6 +16,4 @@ target_preserve_min 2d
 rate_limit no
 volume /mnt/r5
 subvolume d
-# moved
-#subvolume ar
-#subvolume roverflow
+subvolume r

diff --git a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr5.service b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr5.service
index 849d7f1faf1a266bf1758ba7809cdb3151510a32..a23db9703d1c3353ead73569406c1cf75e207972 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr5.service
+++ b/machine_specific/frodo/filesystem/etc/systemd/system/btrbkr5.service
@@ -1,7 +1,7 @@
 [Unit]
-Description=Snapshot subvolumes that have a primary location in /mnt/rbackup
+Description=Snapshot subvolumes that have a primary location in /mnt/r5
 After=multi-user.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/local/bin/sysd-mail-once btrbkrbackup btrbk -c /etc/btrbk/rbackup.conf run
+ExecStart=/usr/local/bin/sysd-mail-once btrbkr5 btrbk -c /etc/btrbk/r5.conf run

diff --git a/machine_specific/frodo/filesystem/etc/systemd/system/wg-quick-tr-pre@.service b/machine_specific/frodo/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
index 2ec99b5498fd89cc28a05035a5a4b0aac6932007..1e6017eb32c45cd3c2d51f2618cb77364312f807 100644 (file)
--- a/machine_specific/frodo/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
+++ b/machine_specific/frodo/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
@@ -3,8 +3,8 @@ Description=Initial setup of netns for wg-quick-tr %I
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns -n 10.174.34 start %i
-ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns stop %i
+ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns -n 10.174.34 start %i
+ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns stop %i
 RemainAfterExit=yes
 
 [Install]

diff --git a/machine_specific/kd/filesystem/etc/systemd/system/wg-quick-tr-pre@.service b/machine_specific/kd/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
index caf4faf303c93eb0023763aded525d799d5e327a..a837dd7aa853152a116a91239fb254bf6f74cd23 100644 (file)
--- a/machine_specific/kd/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
+++ b/machine_specific/kd/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
@@ -3,8 +3,8 @@ Description=Initial setup of netns for wg-quick-tr %I
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns -n 10.174.2 start %i
-ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns stop %i
+ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns -n 10.174.2 start %i
+ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns stop %i
 RemainAfterExit=yes
 
 [Install]

diff --git a/machine_specific/librestation01/filesystem/etc/systemd/system/wg-quick-tr-pre@.service b/machine_specific/librestation01/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
index b06d4bd146e0bda04ab7b84c55f419630ec3eeb0..62c09826735cbd4d6925987d5d3d88d641e3e7d6 100644 (file)
--- a/machine_specific/librestation01/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
+++ b/machine_specific/librestation01/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
@@ -3,8 +3,8 @@ Description=Initial setup of netns for wg-quick-tr %I
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns -n 10.174.97 start %i
-ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns stop %i
+ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns -n 10.174.97 start %i
+ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns stop %i
 RemainAfterExit=yes
 
 [Install]

diff --git a/machine_specific/librestation03/filesystem/etc/systemd/system/wg-quick-tr-pre@.service b/machine_specific/librestation03/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
index 4fcbbf05672bbe9d8a1b635cbf8340218440f579..16560d18967cc197ad7a5dbcc2913d2ebdafec71 100644 (file)
--- a/machine_specific/librestation03/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
+++ b/machine_specific/librestation03/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
@@ -3,8 +3,8 @@ Description=Initial setup of netns for wg-quick-tr %I
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns -n 10.174.99 start %i
-ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns stop %i
+ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns -n 10.174.99 start %i
+ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns stop %i
 RemainAfterExit=yes
 
 [Install]

diff --git a/machine_specific/sf/filesystem/etc/systemd/system/wg-quick-tr-pre@.service b/machine_specific/sf/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
index 94ed15cc0efe1d5994b71ae91d9fdce37de9a04a..554ea54dfa44470922a44fd7851c526fc0248da0 100644 (file)
--- a/machine_specific/sf/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
+++ b/machine_specific/sf/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
@@ -3,8 +3,8 @@ Description=Initial setup of netns for wg-quick-tr %I
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns -n 10.174.9 start %i
-ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns stop %i
+ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns -n 10.174.9 start %i
+ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns stop %i
 RemainAfterExit=yes
 
 [Install]

diff --git a/machine_specific/so/filesystem/etc/systemd/system/wg-quick-tr-pre@.service b/machine_specific/so/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
index e2c0222c3840e74285d587193659327d02fc9ff6..e59c9222c4b416b93d052e58b4c01f11969c6f09 100644 (file)
--- a/machine_specific/so/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
+++ b/machine_specific/so/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
@@ -3,8 +3,8 @@ Description=Initial setup of netns for wg-quick-tr %I
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns -n 10.174.3 start %i
-ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns stop %i
+ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns -n 10.174.3 start %i
+ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns stop %i
 RemainAfterExit=yes
 
 [Install]

diff --git a/machine_specific/sy/filesystem/etc/systemd/system/wg-quick-tr-pre@.service b/machine_specific/sy/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
index 151c8237f25e3245ca69b8ad867bf48bad2d650d..31c0184fbdbd5876340369e8188e3364e28e017a 100644 (file)
--- a/machine_specific/sy/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
+++ b/machine_specific/sy/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
@@ -3,8 +3,8 @@ Description=Initial setup of netns for wg-quick-tr %I
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns -n 10.174.7 start %i
-ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns stop %i
+ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns -n 10.174.7 start %i
+ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns stop %i
 RemainAfterExit=yes
 
 [Install]

diff --git a/machine_specific/x2/filesystem/etc/systemd/system/wg-quick-tr-pre@.service b/machine_specific/x2/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
index 2b4e14b15e77a6488a71ada95c911bcd34017018..9e231e366f3bcd1054bb3fa6dfd05b6f36cbca28 100644 (file)
--- a/machine_specific/x2/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
+++ b/machine_specific/x2/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
@@ -3,8 +3,8 @@ Description=Initial setup of netns for wg-quick-tr %I
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns -n 10.174.28 start %i
-ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns stop %i
+ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns -n 10.174.28 start %i
+ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns stop %i
 RemainAfterExit=yes
 
 [Install]

diff --git a/machine_specific/x3/filesystem/etc/systemd/system/wg-quick-tr-pre@.service b/machine_specific/x3/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
index 73a2299373969198d7502efe64813a9bcb5ab67c..9370efe234a7cd42e0607a0c57392d827357f274 100644 (file)
--- a/machine_specific/x3/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
+++ b/machine_specific/x3/filesystem/etc/systemd/system/wg-quick-tr-pre@.service
@@ -3,8 +3,8 @@ Description=Initial setup of netns for wg-quick-tr %I
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns -n 10.174.8 start %i
-ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns/newns stop %i
+ExecStart=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns -n 10.174.8 start %i
+ExecStop=/usr/bin/flock -w 20 /tmp/newns.flock /usr/local/bin/newns stop %i
 RemainAfterExit=yes
 
 [Install]

diff --git a/subdir_files/.config/konsolerc b/subdir_files/.config/konsolerc
new file mode 100644 (file)
index 0000000..c123bee
--- /dev/null
+++ b/subdir_files/.config/konsolerc
@@ -0,0 +1,43 @@
+[Desktop Entry]
+DefaultProfile=profileian.profile
+
+[Favorite Profiles]
+Favorites=profileian.profile
+
+[General]
+ConfigVersion=1
+
+[KonsoleWindow]
+ShowMenuBarByDefault=false
+
+[MainWindow]
+1920x1080 screen: Height=249
+1920x1080 screen: Width=1916
+1920x1080 screen: XPosition=2
+1920x1080 screen: YPosition=286
+1920x1200 screen: Height=1196
+1920x1200 screen: Width=956
+1920x1200 screen: XPosition=962
+1920x1200 screen: YPosition=2
+2 screens: Height=578
+2 screens: Width=1916
+2 screens: XPosition=2
+2 screens: YPosition=2
+DP-1 eDP-1=DP-1
+DP-1-1 eDP-1=DP-1-1
+DP-1-3 eDP-1=eDP-1
+HDMI-1 eDP-1=eDP-1
+HDMI-2 eDP-1=HDMI-2
+MenuBar=Disabled
+State=AAAA/wAAAAD9AAAAAQAAAAAAAAAAAAAAAPwCAAAAAvsAAAAiAFEAdQBpAGMAawBDAG8AbQBtAGEAbgBkAHMARABvAGMAawAAAAAA/////wAAAXYA////+wAAABwAUwBTAEgATQBhAG4AYQBnAGUAcgBEAG8AYwBrAAAAAAD/////AAABFgD///8AAAd6AAAIagAAAAQAAAAEAAAACAAAAAj8AAAAAQAAAAIAAAACAAAAFgBtAGEAaQBuAFQAbwBvAGwAQgBhAHIAAAAAAP////8AAAAAAAAAAAAAABwAcwBlAHMAcwBpAG8AbgBUAG8AbwBsAGIAYQByAAAAAIz/////AAAAAAAAAAA=
+ToolBarsMovable=Disabled
+eDP-1=eDP-1
+
+[TabBar]
+TabBarPosition=Top
+
+[ThumbnailsSettings]
+EnableThumbnails=false
+
+[UiSettings]
+ColorScheme=