X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=mount-latest-subvol;h=540f9ab3a6278cb1ccad24890e74d9f93c1ee2f7;hb=a7f9b883055cb1c4056469d498c7bc6564670c37;hp=d36685f3b41e6bf717b5a31ba8f152cfe1d79bde;hpb=565857e91b7e8c671ec3f4314cb21b0a85c01d0f;p=distro-setup

diff --git a/mount-latest-subvol b/mount-latest-subvol
index d36685f..540f9ab 100644
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -14,6 +14,9 @@
 # limitations under the License.
 
 # usage: mount-latest-subvol
+#
+# Note, at source location, intentionally not executable, run and read
+# install-my-scripts.
 
 cd /
 [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
@@ -86,7 +89,7 @@ pid-check() {
   for p in ${pids}; do
     for m in ${my_pids[@]}; do
       if (( p == m )); then
-        echo "$0: error: pids to kill includes our pid or a parent" >&2
+        echo "$0: error: pids to kill includes our pid or a parent. ps output:" >&2
         ps -f -p $p
         exit 1
       fi
@@ -216,7 +219,8 @@ for vol in q a o i; do
 
 
   # if latest is already mounted, make sure binds are mounted and move on
-  if e check-subvol-stale $d; then
+  e check-subvol-stale $d
+  if [[ -e  /nocow/btrfs-stale/${d##*/} ]] ; then
     mnt $d
     for b in ${binds[@]}; do
       mnt $b