iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix mistake from recent commit
[distro-setup]
/
mount-latest-subvol
diff --git
a/mount-latest-subvol
b/mount-latest-subvol
index 540f9ab3a6278cb1ccad24890e74d9f93c1ee2f7..e1d4d1a74d56f4830d2de8319155cbfc51846ec5 100644
(file)
--- 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 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
mnt $d
for b in ${binds[@]}; do
mnt $b
@@
-228,14
+229,6
@@
for vol in q a o i; do
continue
fi
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
umount_ret=true
unmounted=()
for dir in $(echo $d ${binds[*]}\ |tac -s\ ); do