robustness

[distro-setup] / check-subvol-stale

diff --git a/check-subvol-stale b/check-subvol-stale
index cc032d41715425e07fd777c46bdf303bbffc6487..8d9ac786c6b71644df4708f58b2f88f112caf692 100644 (file)
--- a/check-subvol-stale
+++ b/check-subvol-stale
@@ -88,7 +88,7 @@ for d; do
   d subvol_dir=$subvol_dir
   # note, we need $dev because $d might not be mounted, and we do this loop
   # 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
+  for devx in $(btrfs fil 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 /etc/fstab|head -n1)
     if [[ $root_dir ]]; then
@@ -104,7 +104,7 @@ for d; do
   d "svp=$svp # subvolume path"
 
   snaps=($root_dir/btrbk/$subvol_dir.20*) # Assumes we are in the 21st century.
-  if [[ ! $snaps ]]; then
+  if [[ ! ${snaps[@]} ]]; then
     # no snapshots yet
     echo "$0: warning: no snapshots found at $root_dir/btrbk/$subvol_dir.20*. this is expected for a brand new volume"
     continue
@@ -161,7 +161,7 @@ for d; do
     if [[ $svp_cgen -ge $last_received_cgen ]]; then
       stale=false
     else
-      echo "$svp stale: it's gen at creation, $svp_cgen, is earlier than the last received snapshot, $last_received's gen at creation: $last_received_cgen"
+      d "$svp stale: it's gen at creation, $svp_cgen, is earlier than the last received snapshot, $last_received's gen at creation: $last_received_cgen"
       freshest_snap=$last_received
       stale=true
     fi