various minor fixes

[distro-setup] / mount-latest-subvol

diff --git a/mount-latest-subvol b/mount-latest-subvol
index d39b8823f89a1da652c035f320a513d1cf13dc45..36895aa1612ad1d58bc923775d19887117fdf60f 100644 (file)
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -81,6 +81,33 @@ fstab() {
         tu /etc/fstab <<<"$l"
     done
 }
+kill-dir() {
+    for sig; do
+        echo kill-dir $sig
+        found_pids=false
+        if pids=$(timeout 4 lsof -t $dir); then
+            found_pids=true
+            timeout 4 lsof -w $dir
+            kill -$sig $pids
+        fi
+        # fuser will find open sockets that lsof won't, for example from gpg-agent.
+        # note: -v shows kernel processes, which then doesn't return true when we want
+        if timeout 4 fuser -m $dir &>/dev/null; then
+            found_pids=true
+            fuser -$sig -mvk $dir
+        fi
+        sleep .5
+        if ! $found_pids; then
+            return 0
+        fi
+    done
+    return 1
+}
+
+force=false
+if [[ $1 == -f ]]; then
+    force=true
+fi
 
 ret=0
 
@@ -92,10 +119,14 @@ EOF
 
 shopt -s nullglob
 
+# ssh and probably some other things care about parent directory
+# ownership, and ssh doesn\'t allow any group writable parent
+# directories, so we are forced to use a directory structure similar
+# to home directories
 f=(/mnt/root/btrbk/q.*)
 if [[ -e $f ]]; then
     fstab <<EOF
-$first_root_crypt  /q  btrfs  noatime,subvol=q  0 0
+$first_root_crypt  /q  btrfs  noatime,subvol=q,gid=1000  0 0
 /q/p  /p  none  bind  0 0
 EOF
 fi
@@ -163,18 +194,10 @@ for vol in q a o i; do
             if e umount -R $dir; then
                 unmounted+=($dir)
             else
-                if pids=$(timeout 4 lsof -t $dir); then
-                    timeout 4 lsof -w $dir
-                    kill $pids
-                fi
-
-                # fuser will find open sockets that lsof won't, for example from gpg-agent.
-                # note: -v shows kernel processes, which then doesn't return true when we want
-                if timeout 4 fuser -m $dir &>/dev/null; then
-                    fuser -TERM -mvk $dir
+                if ! kill-dir TERM TERM TERM INT INT HUP HUP; then
+                    if $force; then  kill-dir KILL; fi
                 fi
 
-                sleep .5
                 if e umount -R $dir; then
                     unmounted+=($dir)
                 else