From 1e995db626d974b9bf4f83807d52ae5924bbba51 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Wed, 1 Apr 2026 03:45:58 -0400 Subject: [PATCH] mostly fix backups. untested --- brc | 3 ++ .../frodo/filesystem/etc/btrbk/n123.conf | 39 ------------------- .../frodo/filesystem/etc/btrbk/nbase.conf | 17 ++++++++ .../frodo/filesystem/etc/btrbk/r2.conf | 19 +++++---- .../frodo/filesystem/etc/btrbk/r3.conf | 18 ++++----- .../frodo/filesystem/etc/btrbk/r4.conf | 23 ++++------- .../frodo/filesystem/etc/btrbk/r5.conf | 20 +++++----- .../frodo/filesystem/etc/btrbk/root.conf | 23 +++++------ .../frodo/filesystem/etc/integritytab | 4 ++ .../kd/filesystem/etc/btrbk/r6.conf | 17 ++++++++ .../etc/systemd/system/btrbkr6.service | 7 ++++ .../etc/systemd/system/btrbkr6.timer | 8 ++++ subdir_files/.config/konsolerc | 4 +- .../.config/systemd/user/profanity.service | 7 +++- 14 files changed, 112 insertions(+), 97 deletions(-) delete mode 100644 machine_specific/frodo/filesystem/etc/btrbk/n123.conf create mode 100644 machine_specific/frodo/filesystem/etc/btrbk/nbase.conf create mode 100644 machine_specific/frodo/filesystem/etc/integritytab create mode 100644 machine_specific/kd/filesystem/etc/btrbk/r6.conf create mode 100644 machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.service create mode 100644 machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.timer diff --git a/brc b/brc index 557fe50..22bb487 100644 --- a/brc +++ b/brc @@ -4924,6 +4924,9 @@ pidw() { local x=$(mktemp); e $pid >$x; pidwait -e -F $x; rm $x } +# printf string + newline +pn() { printf '%s\n' "$@"; } + # * stuff that makes sense to be at the end # note, if we unset IFS, that will mess up completion scripts which diff --git a/machine_specific/frodo/filesystem/etc/btrbk/n123.conf b/machine_specific/frodo/filesystem/etc/btrbk/n123.conf deleted file mode 100644 index b54f8ee..0000000 --- a/machine_specific/frodo/filesystem/etc/btrbk/n123.conf +++ /dev/null @@ -1,39 +0,0 @@ -transaction_syslog local7 - -lockfile /var/lock/btrbk-n3.lock - -timestamp_format long-iso - -snapshot_create onchange - -snapshot_preserve 18h 14d 8w 12m -snapshot_preserve_min 2d -snapshot_dir btrbk - -target_preserve 18h 14d 8w 12m -target_preserve_min 2d - -rate_limit no - -volume /mnt/n3 -subvolume dia -subvolume dib -subvolume dic -subvolume did -subvolume die -subvolume dif -subvolume dig -subvolume dih -subvolume dii -subvolume dij -subvolume dik -subvolume dil -subvolume dim -subvolume din -subvolume dio -subvolume dip -subvolume diq -subvolume dir -subvolume dis -subvolume dit -subvolume dlapi diff --git a/machine_specific/frodo/filesystem/etc/btrbk/nbase.conf b/machine_specific/frodo/filesystem/etc/btrbk/nbase.conf new file mode 100644 index 0000000..09a0049 --- /dev/null +++ b/machine_specific/frodo/filesystem/etc/btrbk/nbase.conf @@ -0,0 +1,17 @@ +lockfile /var/lock/btrbk-nbase.lock +transaction_syslog local7 +timestamp_format long-iso +send_compressed_data yes +snapshot_preserve 18h 14d 8w 12m +snapshot_preserve_min 2d +snapshot_dir btrbk +target_preserve 18h 14d 8w 12m +target_preserve_min 2d +snapshot_create onchange + +volume /mnt/nbase +subvolume rbase +target send-receive /mnt/root/btrbk +target send-receive ssh://kd.b8.nz/mnt/r6/btrbk +subvolume rjson +target send-receive ssh://kd.b8.nz/mnt/r6/btrbk diff --git a/machine_specific/frodo/filesystem/etc/btrbk/r2.conf b/machine_specific/frodo/filesystem/etc/btrbk/r2.conf index 2dd61a5..83b5c20 100644 --- a/machine_specific/frodo/filesystem/etc/btrbk/r2.conf +++ b/machine_specific/frodo/filesystem/etc/btrbk/r2.conf @@ -1,19 +1,22 @@ +lockfile /var/lock/btrbk-r2.lock transaction_syslog local7 - -lockfile /var/lock/btrbk-r2.lock - timestamp_format long-iso - -snapshot_create onchange - +send_compressed_data yes snapshot_preserve 18h 14d 8w 12m snapshot_preserve_min 2d snapshot_dir btrbk - target_preserve 18h 14d 8w 12m target_preserve_min 2d +snapshot_create onchange -rate_limit no volume /mnt/r2 subvolume srip1 subvolume fsf-mailrec +subvolume m8 +subvolume m9 +subvolume ma +subvolume mb +subvolume diq +subvolume dir +subvolume dis +subvolume dit diff --git a/machine_specific/frodo/filesystem/etc/btrbk/r3.conf b/machine_specific/frodo/filesystem/etc/btrbk/r3.conf index 0fc7d4a..1312e95 100644 --- a/machine_specific/frodo/filesystem/etc/btrbk/r3.conf +++ b/machine_specific/frodo/filesystem/etc/btrbk/r3.conf @@ -1,26 +1,22 @@ +lockfile /var/lock/btrbk-r3.lock transaction_syslog local7 - -lockfile /var/lock/btrbk-r3.lock - timestamp_format long-iso - -snapshot_create onchange - +send_compressed_data yes snapshot_preserve 18h 14d 8w 12m snapshot_preserve_min 2d snapshot_dir btrbk - target_preserve 18h 14d 8w 12m target_preserve_min 2d +snapshot_create onchange -rate_limit no volume /mnt/r3 subvolume ar subvolume d-r3 -subvolume m8 -subvolume m9 - subvolume qr subvolume srip2 +subvolume dia +subvolume dib +subvolume dic +subvolume did diff --git a/machine_specific/frodo/filesystem/etc/btrbk/r4.conf b/machine_specific/frodo/filesystem/etc/btrbk/r4.conf index 9cbe7b8..f50832a 100644 --- a/machine_specific/frodo/filesystem/etc/btrbk/r4.conf +++ b/machine_specific/frodo/filesystem/etc/btrbk/r4.conf @@ -1,30 +1,21 @@ +lockfile /var/lock/btrbk-r4.lock transaction_syslog local7 - -lockfile /var/lock/btrbk-r4.lock - timestamp_format long-iso - -snapshot_create onchange - +send_compressed_data yes snapshot_preserve 18h 14d 8w 12m snapshot_preserve_min 2d snapshot_dir btrbk - target_preserve 18h 14d 8w 12m target_preserve_min 2d +snapshot_create onchange -rate_limit no volume /mnt/r4 -subvolume m3 subvolume m4 subvolume m5 subvolume m6 subvolume m7 -subvolume ma -subvolume mb -subvolume mc -subvolume md -subvolume me -subvolume mf - subvolume roverflow +subvolume die +subvolume dif +subvolume dig +subvolume dih diff --git a/machine_specific/frodo/filesystem/etc/btrbk/r5.conf b/machine_specific/frodo/filesystem/etc/btrbk/r5.conf index 3798a87..d8324cb 100644 --- a/machine_specific/frodo/filesystem/etc/btrbk/r5.conf +++ b/machine_specific/frodo/filesystem/etc/btrbk/r5.conf @@ -1,19 +1,21 @@ +lockfile /var/lock/btrbk-r5.lock transaction_syslog local7 - -lockfile /var/lock/btrbk-r5.lock - timestamp_format long-iso - -snapshot_create onchange - +send_compressed_data yes snapshot_preserve 18h 14d 8w 12m snapshot_preserve_min 2d snapshot_dir btrbk - target_preserve 18h 14d 8w 12m target_preserve_min 2d - -rate_limit no +snapshot_create onchange volume /mnt/r5 subvolume d +subvolume mc +subvolume md +subvolume me +subvolume mf +subvolume dii +subvolume dij +subvolume dik +subvolume dil diff --git a/machine_specific/frodo/filesystem/etc/btrbk/root.conf b/machine_specific/frodo/filesystem/etc/btrbk/root.conf index b48b877..038ca9a 100644 --- a/machine_specific/frodo/filesystem/etc/btrbk/root.conf +++ b/machine_specific/frodo/filesystem/etc/btrbk/root.conf @@ -1,24 +1,25 @@ +lockfile /var/lock/btrbk-root.lock transaction_syslog local7 - -lockfile /var/lock/btrbk-root.lock - timestamp_format long-iso - -snapshot_create onchange - +send_compressed_data yes snapshot_preserve 18h 14d 8w 12m snapshot_preserve_min 2d snapshot_dir btrbk - target_preserve 18h 14d 8w 12m target_preserve_min 2d +snapshot_create onchange -rate_limit no volume /mnt/root - -# a & q are handled separately by btrbk-run & btrbk.timer - subvolume m0 +target send-receive /mnt/r3/btrbk subvolume m1 +target send-receive /mnt/r3/btrbk subvolume m2 +target send-receive /mnt/r3/btrbk +subvolume m3 +target send-receive /mnt/r3/btrbk subvolume ro2 +target send-receive ssh://kd.b8.nz/mnt/r6/btrbk + + +# side note: a & q are handled separately by btrbk-run & btrbk.timer diff --git a/machine_specific/frodo/filesystem/etc/integritytab b/machine_specific/frodo/filesystem/etc/integritytab new file mode 100644 index 0000000..2730192 --- /dev/null +++ b/machine_specific/frodo/filesystem/etc/integritytab @@ -0,0 +1,4 @@ +int-vgnvme-WD_BLACK_SN850P_for_PS5_8000GB_24517P800200-ndi /dev/vgnvme-WD_BLACK_SN850P_for_PS5_8000GB_24517P800200/ndi - allow-discards,mode=direct +int-vgnvme-WD_BLACK_SN850X_8000GB_245244802091-ndi /dev/vgnvme-WD_BLACK_SN850X_8000GB_245244802091/ndi - allow-discards,mode=direct +int-vgnvme-WD_BLACK_SN850X_8000GB_245244802317-ndi /dev/vgnvme-WD_BLACK_SN850X_8000GB_245244802317/ndi - allow-discards,mode=direct +int-vgnvme-WD_BLACK_SN850X_8000GB_25026Y802189-ndi /dev/vgnvme-WD_BLACK_SN850X_8000GB_25026Y802189/ndi - allow-discards,mode=direct diff --git a/machine_specific/kd/filesystem/etc/btrbk/r6.conf b/machine_specific/kd/filesystem/etc/btrbk/r6.conf new file mode 100644 index 0000000..4a63ef2 --- /dev/null +++ b/machine_specific/kd/filesystem/etc/btrbk/r6.conf @@ -0,0 +1,17 @@ +lockfile /var/lock/btrbk-r6.lock +transaction_syslog local7 +timestamp_format long-iso +send_compressed_data yes +snapshot_preserve 18h 14d 8w 12m +snapshot_preserve_min 2d +snapshot_dir btrbk +target_preserve 18h 14d 8w 12m +target_preserve_min 2d +snapshot_create onchange + +volume /mnt/r6 +subvolume dim +subvolume din +subvolume dio +subvolume dip +subvolume fsf-kaya diff --git a/machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.service b/machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.service new file mode 100644 index 0000000..0378e40 --- /dev/null +++ b/machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.service @@ -0,0 +1,7 @@ +[Unit] +Description=Snapshot subvolumes that have a primary location in /mnt/r6 +After=multi-user.target + +[Service] +Type=oneshot +ExecStart=/usr/local/bin/sysd-mail-once btrbkr6 btrbk -c /etc/btrbk/r6.conf run diff --git a/machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.timer b/machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.timer new file mode 100644 index 0000000..6239024 --- /dev/null +++ b/machine_specific/kd/filesystem/etc/systemd/system/btrbkr6.timer @@ -0,0 +1,8 @@ +[Unit] +Description=Btrbk rbackup timer + +[Timer] +OnCalendar=*-*-* 23:30:00 America/New_York + +[Install] +WantedBy=timers.target diff --git a/subdir_files/.config/konsolerc b/subdir_files/.config/konsolerc index 310d7bf..32bf4aa 100644 --- a/subdir_files/.config/konsolerc +++ b/subdir_files/.config/konsolerc @@ -24,8 +24,8 @@ ShowMenuBarByDefault=false 2 screens: XPosition=2 2 screens: YPosition=2 3840x2160 screen: Height=2156 -3840x2160 screen: Width=3836 -3840x2160 screen: XPosition=2 +3840x2160 screen: Width=956 +3840x2160 screen: XPosition=1922 3840x2160 screen: YPosition=2 DP-0=DP-0 DP-1 eDP-1=DP-1 diff --git a/subdir_files/.config/systemd/user/profanity.service b/subdir_files/.config/systemd/user/profanity.service index 65bd785..c90c02d 100644 --- a/subdir_files/.config/systemd/user/profanity.service +++ b/subdir_files/.config/systemd/user/profanity.service @@ -10,9 +10,14 @@ Description=profanity # After=default.target. I figured this probably works and is simpler. After=gpg-agent.service After=local-fs.target -# on desktop, we need /d to mount, and based on logs, this is the next target after it mounts: +# on desktop, we need /d to mount, and based on logs, this is the next target after it mounts. +# However, this does nothing since a user service is blind to system targets. After=multi-user.target +Restart=always +RestartSec=30 +TimeoutStartSec=300 + [Service] # tmux requirement Type=forking -- 2.30.2