organize / cleanup

[distro-setup] / mount-latest-subvol

diff --git a/mount-latest-subvol b/mount-latest-subvol
index 1b0a8e23123201182ac5eb0d7a99ca626f982652..d7be613c763d122d0259b5a434ca4a161f599627 100644 (file)
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -81,6 +81,31 @@ fstab() {
         tu /etc/fstab <<<"$l"
     done
 }
+kill-dir() {
+    found_pids=false
+    sig=${1:-TERM}
+    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
+    if $found_pids; then
+        sleep .5
+        return 0
+    fi
+    return 1
+}
+
+force=false
+if [[ $1 == -f ]]; then
+    force=true
+fi
 
 ret=0
 
@@ -89,16 +114,29 @@ first_root_crypt=$(awk '$2 == "/" {print $1}' /etc/mtab)
 fstab <<EOF
 $first_root_crypt  /a  btrfs  noatime,subvol=a  0 0
 EOF
-case $HOSTNAME in
-    treetowl|x2|frodo)
-        fstab <<EOF
-$first_root_crypt  /q  btrfs  noatime,subvol=q  0 0
-$first_root_crypt  /o  btrfs  noatime,subvol=o  0 0
+
+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,gid=1000  0 0
 /q/p  /p  none  bind  0 0
+EOF
+fi
+
+f=(/mnt/root/btrbk/o.*)
+if [[ -e $f ]]; then
+    fstab <<EOF
+$first_root_crypt  /o  btrfs  noatime,subvol=o  0 0
 /o/m  /m  none  bind  0 0
 EOF
-        ;;
-esac
+fi
+
 if [[ $HOSTNAME == frodo ]]; then
     fstab <<EOF
 $first_root_crypt  /i  btrfs  noatime,subvol=i  0 0
@@ -154,19 +192,12 @@ for vol in q a o i; do
             if e umount -R $dir; then
                 unmounted+=($dir)
             else
-                echo "$0: failed to umount $dir"
-                # lsof will fail if it finds no pids
-                if ! e timeout 4 lsof $dir; then
-                    umount_ret=false
-                    ret=1
-                    continue
-                fi
-                pids=$(lsof -t $dir) ||:
-                kill $pids
-                sleep .5
+                kill-dir || kill-dir INT || kill-dir HUP || ! $force || kill-dir KILL ||:
+
                 if e umount -R $dir; then
                     unmounted+=($dir)
                 else
+                    echo "$0: failed to umount $dir"
                     umount_ret=false
                     ret=1
                     continue