push-btrfs-scan: remove timer and conf file for blacklisted subvolumes

1 files changed, 42 insertions, 9 deletions

diff --git a/src/btrfs-scan b/src/push-btrfs-scan
index 9213dfc..bc97d00 100755
--- a/src/btrfs-scan
+++ b/src/push-btrfs-scan
@@ -38,33 +38,66 @@ is_our_snapshot()
   esac
 }
 
-filter_blacklist()
+filter_readonly()
+{
+    if btrfs subvolume show -r "$id" / | sed -Ene '/^\tFlags:.*\breadonly\b/{p;q1}' -e '$q'
+    then
+        if [ -e "$conf_name" ]
+        then
+            printf '%20s %s\n' delete "$conf_name" >&2
+        fi
+        printf '%20s %s\n' '(snapshot) lose' "$path_fixed" >&2
+        return
+    fi
+    "$@"
+}
+
+filter_snapshot_filename()
 {
     if is_our_snapshot "$path_fixed"
     then
         if [ -e "$conf_name" ]
         then
             printf '%20s %s\n' delete "$conf_name" >&2
-            printf '%20s %s\n' '(snapshot) lose' "$path_fixed" >&2
         fi
+        printf '%20s %s\n' '(snapshot) lose' "$path_fixed" >&2
         return
+    fi
+    "$@"
+}
 
-    # Re-reading the blacklist file once per snapshot is not ideal,
-    # but is fine.
-    elif [ "$blacklist" -a -f "$blacklist" ]
+systemctl_disable_quiet()
+{
+    ! systemctl is-enabled "$@" 2>/dev/null || systemctl disable "$@"
+}
+
+timer_prefix=/etc/systemd/system/default.target.wants/push-btrfs@borges
+unset blacklist_patterns
+declare -a blacklist_patterns
+filter_blacklist()
+{
+    if [ "$blacklist" -a -f "$blacklist" ]
     then
-        while read pattern
+        if ! [ -v blacklist_patterns ]
+        then
+            readarray -t blacklist_patterns < "$blacklist"
+        fi
+
+        for pattern in "${blacklist_patterns[@]}"
         do
             if [[ $path_fixed == $pattern ]]
             then
+                printf '%20s %s\n' '(blacklist) lose' "$path_fixed" >&2
                 if [ -e "$conf_name" ]
                 then
                     printf '%20s %s\n' delete "$conf_name" >&2
+                    rm "$conf_name"
                 fi
-                printf '%20s %s\n' '(blacklist) lose' "$path_fixed" >&2
+                timer=$destination_host$(systemd-escape "$path_fixed").timer
+                systemctl_disable_quiet "$timer"
                 return
             fi
-        done < "$blacklist"
+        done
     fi
     "$@"
 }
@@ -155,4 +188,4 @@ esac
 
 ssh root@"$destination_host" true || read -p 'Could not log in.  Continue? '
 
-with_subvolumes fixup_path compute_paths filter_blacklist mirror
+with_subvolumes fixup_path compute_paths filter_snapshot_filename filter_blacklist mirror