From d9958cbbc1eb7390e60f5b0050f04ad7e22dac94 Mon Sep 17 00:00:00 2001
From: Axel Burri <axel@tty0.ch>
Date: Fri, 16 Apr 2021 22:04:44 +0200
Subject: [PATCH] btrbk-verify: use new raw table format keys

---
 contrib/cron/btrbk-verify | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/cron/btrbk-verify b/contrib/cron/btrbk-verify
index c056dfa..9d5b422 100755
--- a/contrib/cron/btrbk-verify
+++ b/contrib/cron/btrbk-verify
@@ -77,7 +77,7 @@ set -u
 set -e
 set -o pipefail
 
-btrbk_version_min='0.28.0'
+btrbk_version_min='0.32.0'
 
 # defaults: ignore subvol dirs and root folder timestamp change
 ignore_nested_subvolume_dir=1
@@ -371,20 +371,20 @@ while read -r btrbk_list_line; do
     log_debug "Evaluating [btrbk list] line: $btrbk_list_line"
     [[ -z "$btrbk_list_line" ]] && continue
     if ! eval_btrbk_resolved_line "$btrbk_list_line" \
-         "R_" "snapshot_path target_path source_host target_host target_type source_rsh target_rsh"
+         "R_" "snapshot_subvolume target_subvolume source_host target_host target_type source_rsh target_rsh"
     then
         log_line "btrbk-verify: WARNING: Skipping task (parse error). Make sure to have >=btrbk-${btrbk_version_min} installed!"
         continue
     fi
 
-    source="${R_snapshot_path}"
-    target="${R_target_path}"
+    source="${R_snapshot_subvolume}"
+    target="${R_target_subvolume}"
     [[ -n "$R_source_host" ]] && source="${R_source_host}:${source}"
     [[ -n "$R_target_host" ]] && target="${R_target_host}:${target}"
 
-    if [[ -z "$R_snapshot_path" ]]; then
+    if [[ -z "$R_snapshot_subvolume" ]]; then
         log_line "WARNING: Skipping task (missing snapshot): target=$target"
-    elif [[ -z "$R_target_path" ]]; then
+    elif [[ -z "$R_target_subvolume" ]]; then
         log_line "Skipping task (no target): source=$source"
     elif [[ "$R_target_type" != "send-receive" ]]; then
         log_line "Skipping task (target_type=$R_target_type): source=$source, target=$target"