various fixes

[distro-setup] / ziva-backup-check

diff --git a/ziva-backup-check b/ziva-backup-check
index 31ae7ddcf42956ffdc98723e1e6195a2270ab731..664750d91b0b7022fde344cecf1e680449ccd15d 100755 (executable)
--- a/ziva-backup-check
+++ b/ziva-backup-check
@@ -20,10 +20,11 @@ fi
 ## begin check on btrbk
 now=$(date +%s)
 age_limit_sec=$(( 60 * 60 * 50 )) # 50 hours
-for vol in {root,boot}_ubuntubionic; do
-  snaps=(/mnt/r7/amy/btrbk/${vol}.20*)
+for prefix in root boot; do
+  vol=${prefix}_ubuntubionic
+  snaps=(/mnt/r7/amy/$prefix/btrbk/${vol}.20*)
   if [[ ! ${snaps[*]} ]]; then
-    err no snapshots starting with /mnt/r7/amy/btrbk/${vol}_ubuntubionic.20
+    err no snapshots starting with /mnt/r7/amy/$prefix/btrbk/${vol}.20
     break
   fi