X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=check-subvol-stale;h=0049ff011d12e95da1a4edbd902a6feb6bdb561d;hp=085025a50d39b7de8f356b2e0a30c1321a1a3d76;hb=0cc08a73110c15c4e7bbb8c8233a6c122c27490e;hpb=917ca4a71b5c456b741456dc173c144ee7042d89

diff --git a/check-subvol-stale b/check-subvol-stale
index 085025a..0049ff0 100644
--- a/check-subvol-stale
+++ b/check-subvol-stale
@@ -110,10 +110,12 @@ for d; do
   fi
 
   # get info on last received sub
+  last_received=
   last_received_cgen=0
   for f in ${snaps[@]}; do
     show="$(btrfs sub show $f)"
     if echo "$show" | grep -E "Received UUID:\s+[[:alnum:]]" &>/dev/null; then
+      d found received uuid in $f
       cgen=$(echo "$show" | sed -rn 's,^\s*Gen at creation:\s+([0-9]+).*,\1,p')
       if [[ $cgen -gt $last_received_cgen ]]; then
         last_received_cgen=$cgen
@@ -121,8 +123,8 @@ for d; do
       fi
     fi
   done
-  d last_received_cgen=$cgen
-  d last_received=$f
+  d last_received_cgen=$last_received_cgen
+  d last_received=$last_received
 
   # Get last_snap by date.
   # when a btrbk bugfix makes it into the distro,
@@ -139,6 +141,7 @@ for d; do
     echo "$0: error: could not find latest snapshot for $svp among ${snaps[*]}" >&2
     exit 1
   fi
+  d last_snap=$last_snap
 
   if [[ ! -e $svp ]]; then
     echo "$0: warning: subvol does not exist: $svp"
@@ -170,7 +173,7 @@ for d; do
   stale=true
   # fresh if $svp has $last_snap as a snapshot,
   if btrfs sub show $svp 2>/dev/null | sed '0,/^\s*Snapshot(s):/d;s/^\s*//' | \
-      grep -xF btrbk/$last_snap &>/dev/null; then
+      grep -xF ${last_snap#$root_dir/} ; then
     stale=false
   else # or else $svp is a snapshot of $last_snap. we use a uuid
     # comparison, which if I remember from the docs, is a bit more