X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=mount-latest-subvol;h=13cfc3d159967ad8bff254093081dbe66933962a;hb=51c8b40fd2aac71d29dc9298ca65425725ad1edd;hp=cddb714df7962b2fb48521800e07b471267250ff;hpb=b37f31cdee02eab5a7a9bb083688c0a90a973e31;p=distro-setup

diff --git a/mount-latest-subvol b/mount-latest-subvol
index cddb714..13cfc3d 100644
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -18,7 +18,7 @@ readonly this_file
 cd /
 [[ $EUID == 0 ]] || exec sudo -E "$this_file" "$@"
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 
 usage() {
   cat <<EOF
@@ -271,6 +271,7 @@ EOF
   fi
   fstab <<EOF
 /o/m  /m  none  bind$mopts  0 0
+/o/debbugs  /debbugs  none  bind$mopts  0 0
 EOF
 fi
 
@@ -317,6 +318,7 @@ for vol in ${all_vols[@]}; do
   ##### end building up list of bind mounts  ######
 
 
+
   # if latest is already mounted, make sure binds are mounted and move on
   m check-subvol-stale $d
   # populated by check-subvol-stale if stale
@@ -335,6 +337,28 @@ for vol in ${all_vols[@]}; do
     continue
   fi
 
+
+  ##### begin checking for loopback mounts ####
+  found_loop=false
+  for l in $(losetup -ln|awk '{print $6}'); do
+    for dir in $d ${binds[@]}; do
+      if [[ $l == $dir* ]]; then
+        echo "$0: found loopback mount $l. giving up on unmounting $dir"
+        ret=1
+        found_loop=true
+        break
+      fi
+    done
+    if $found_loop; then
+      break
+    fi
+  done
+  if $found_loop; then
+    continue
+  fi
+  ##### end end checking loopback mounts ####
+
+
   ## not using arbtt at the moment
   # if [[ $vol == q ]]; then
   #   ## allow to fail, user might not be logged in