minor improvements

diff --git a/brc b/brc
index 6389c8763dc249881d010b671daf10894d66febe..82b635cfd67462fe137783c3c40ea0892379b01f 100644 (file)
--- a/brc
+++ b/brc
@@ -867,6 +867,8 @@ ccomp bg d
 z() { builtin fg "$@"; }
 ccomp fg z
 
+x() { builtin kill %%; }
+
 dc() {
   diff --strip-trailing-cr -w "$@"   # diff content
 }

diff --git a/btrbk-run b/btrbk-run
index cce2abeae6364e10e194a1788a196049ff4d708e..755e5cc25cc329e38ffb02e752bbce5706610f8c 100644 (file)
--- a/btrbk-run
+++ b/btrbk-run
@@ -368,6 +368,7 @@ echo "mountpoints: ${mountpoints[*]}"
 
 ##### end command line parsing ########
 
+# todo: this has a timing problem, since btrbk.timer could activate the service after this check.
 if ! $fast && [[ $source ]]; then
   if [[ $(ssh $source ps --no-headers -o comm 1) == systemd ]]; then
     status=$(ssh $source systemctl is-active btrbk.service) || : # normally returns 3

diff --git a/distro-end b/distro-end
index 297002831af6a8882e5922578ef68dd64568c382..6f7b8718f5f96cb4c685963e738bf3f8237dd9e8 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -2177,6 +2177,14 @@ esac
 
 ### end bitcoin
 
+case $HOSTNAME in
+  kw|x3)
+    sd /etc/cups/client.conf <<'EOF'
+ServerName printserver0.office.fsf.org
+EOF
+    ;;
+esac
+
 
 end_msg <<'EOF'
 In mate settings settings, change scrolling to two-finger,

diff --git a/filesystem/etc/cups/client.conf b/filesystem/etc/cups/client.conf
deleted file mode 100644 (file)
index 70a9152..0000000
--- a/filesystem/etc/cups/client.conf
+++ /dev/null
@@ -1 +0,0 @@
-#ServerName printserver0.office.fsf.org

diff --git a/switch-mail-host b/switch-mail-host
index ffff83e264dbce8b7e1034d85aea10a055711712..ffb0814b6776e65d0d64366e9c49dd7a5b32e577 100644 (file)
--- a/switch-mail-host
+++ b/switch-mail-host
@@ -10,6 +10,10 @@ Turn off mail receiving on OLD_HOST, run btrbk to move mail to NEW_HOST,
 turn on mail receiving on NEW_HOST.  Assumes we want to move all
 filesystems unless passing -o.
 
+-a         Avoid snapshot /a, /q, and similar. If we haven't
+           made any changes in the last hour, there is no
+           need to snapshot anything but /o, and we will
+           just do that once.
 -i         Disallow incremental backup.
 -o         Only btrbk /o, instead of all filesystems.
 --force    Run even though our local state does not say that MAIL_HOST is
@@ -58,10 +62,11 @@ mail_only=false
 host2_only=false
 force=false
 mp_args="-m /o,/a,/ar,/q,/qr"
-temp=$(getopt -l force,help ioh "$@") || usage 1
+temp=$(getopt -l force,help aioh "$@") || usage 1
 eval set -- "$temp"
 while true; do
   case $1 in
+    -a) snapshot_arg=resume ;;
     --force) force=true ;;
     -i) incremental_arg="-i" ;;
     -o)
@@ -241,7 +246,7 @@ EOF
 
 
 e Running initial btrbk
-m btrbk-run -v $bbk_args $incremental_arg $mp_args || ret=$?
+m btrbk-run -v $bbk_args $incremental_arg $mp_args $snapshot_arg || ret=$?
 if (( ret )); then
   err "failed initial btrbk"
   exit $ret