lots of fixes

[distro-setup] / check-subvol-stale

diff --git a/check-subvol-stale b/check-subvol-stale
index 085025a50d39b7de8f356b2e0a30c1321a1a3d76..cc032d41715425e07fd777c46bdf303bbffc6487 100644 (file)
--- a/check-subvol-stale
+++ b/check-subvol-stale
@@ -82,6 +82,7 @@ for d; do
   vol=${d##*/}
   # second field, non-comment line == $d
   dev=$(sed -rn "s,^\s*([^#]\S*)\s+$d\s.*,\1,p" /etc/fstab /etc/mtab|head -n1)
+
   d dev=$dev
   subvol_dir=$(sed -rn "s,^\s*[^#]\S*\s+$d\s.*\bsubvol=([a-zA-A/]+).*,\1,p" /etc/fstab /etc/mtab|head -n1)
   d subvol_dir=$subvol_dir
@@ -89,7 +90,7 @@ for d; do
   # because the device in fstab for the rootfs can be different.
   for devx in $(btrfs fi show $dev| sed -rn 's#.*path (/\S+)$#\1#p'); do
     d devx=$devx
-    root_dir=$(sed -rn "s,^\s*$devx\s+(\S+).*\bsubvolid=[05]\b.*,\1,p" /etc/mtab|head -n1)
+    root_dir=$(sed -rn "s,^\s*$devx\s+(\S+).*\bsubvolid=[05]\b.*,\1,p" /etc/mtab /etc/fstab|head -n1)
     if [[ $root_dir ]]; then
       d root_dir=$root_dir
       break
@@ -110,10 +111,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 +124,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 +142,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 +174,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