From: Ian Kelling <iank@fsf.org>
Date: Mon, 8 Apr 2019 18:31:05 +0000 (-0400)
Subject: fix mistake from recent commit
X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=commitdiff_plain;h=94fb80d967f107cbde4a3920dededbb406b2443b

fix mistake from recent commit
---

diff --git a/mount-latest-subvol b/mount-latest-subvol
index 540f9ab..e1d4d1a 100644
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -220,7 +220,8 @@ for vol in q a o i; do
 
   # if latest is already mounted, make sure binds are mounted and move on
   e check-subvol-stale $d
-  if [[ -e  /nocow/btrfs-stale/${d##*/} ]] ; then
+  # populated by check-subvol-stale if stale
+  if ! fresh_snap=$(</nocow/btrfs-stale/$vol); then
     mnt $d
     for b in ${binds[@]}; do
       mnt $b
@@ -228,14 +229,6 @@ for vol in q a o i; do
     continue
   fi
 
-  # populated by check-subvol-stale
-  fresh_snap=$(</nocow/btrfs-stale/$vol)
-  if [[ ! $fresh_snap ]]; then
-    echo "$0: error. empty fresh_snap var"
-    ret=1
-    continue
-  fi
-
   umount_ret=true
   unmounted=()
   for dir in $(echo $d ${binds[*]}\ |tac -s\ ); do