X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=mount-latest-subvol;h=36895aa1612ad1d58bc923775d19887117fdf60f;hb=b857462732e15f455e41f26e3048a390d7b399c0;hp=091cf44448d4cace3675056a015f179f9cfa2989;hpb=518131cef6f11e53340287bb28e4bd46c8c72c31;p=distro-setup

diff --git a/mount-latest-subvol b/mount-latest-subvol
index 091cf44..36895aa 100644
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
+# usage: mount-latest-subvol
 
 [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
 
@@ -32,7 +32,7 @@ errcatch() {
     set -o pipefail
 }
 bash-trace() {
-    local -i argc_index=0 arg frame i start=${1:-1} max_indent=8 indent
+    local -i argc_index=0 frame i start=${1:-1} max_indent=8 indent
     local source
     local extdebug=false
     if [[ $(shopt -p extdebug) == *-s* ]]; then
@@ -73,54 +73,116 @@ mnt() {
         e mount $dir
     fi
 }
+fstab() {
+    while read -r start mpoint end; do
+        l="$start $mpoint $end"
+        # kill off any lines that duplicate the mount point.
+        sed --follow-symlinks -ri "\%$l%b;\%^\s*\S+\s+$mpoint\s%d" /etc/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
 
+##### begin setup fstab for subvols we care about ######
 first_root_crypt=$(awk '$2 == "/" {print $1}' /etc/mtab)
-tu /etc/fstab <<EOF
+fstab <<EOF
 $first_root_crypt  /a  btrfs  noatime,subvol=a  0 0
 EOF
-case $HOSTNAME in
-    treetowl|x2|frodo)
-        tu /etc/fstab <<EOF
-$first_root_crypt  /q  btrfs  noatime,subvol=q  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
-        ;;
-esac
+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
+fi
+
+if [[ $HOSTNAME == frodo ]]; then
+    fstab <<EOF
+$first_root_crypt  /i  btrfs  noatime,subvol=i  0 0
+EOF
+fi
+##### end setup fstab for subvols we care about ######
 
-for vol in q a; do
+for vol in q a o i; do
     d=/$vol
     if ! awk '{print $2}' /etc/fstab | grep -xF $d &>/dev/null; then
         continue
     fi
 
 
-    binds=()
-    roots=($d)
+    ##### begin building up list of bind mounts  ######
+    binds=() # list of bind mounts
+    roots=($d) # list of bind mounts, plus the original mount
     while true; do
         new_roots=()
         for r in ${roots[@]}; do
-            # example
+            # eg. when r=/q/p, for lines like
             # /q/p  /p  none  bind  0 0
+            # output /p
             new_roots+=($(sed -rn "s#^$r/\S+\s+(\S+)\s+none\s+bind\s.*#\1#p" /etc/fstab))
         done
         (( ${#new_roots} )) || break
         binds+=(${new_roots[@]})
         roots=( ${new_roots[@]} )
     done
+    ##### end building up list of bind mounts  ######
+
 
     # if latest is already mounted, make sure binds are mounted and move on
     if e check-subvol-stale $d; then
+        mnt $d
         for b in ${binds[@]}; do
             mnt $b
         done
         continue
     fi
 
-    last_snap=$(</nocow/btrfs-stale/$vol)
-    if [[ ! $last_snap ]]; then
-        echo "$0: error. empty last_snap var"
+    fresh_snap=$(</nocow/btrfs-stale/$vol)
+    if [[ ! $fresh_snap ]]; then
+        echo "$0: error. empty fresh_snap var"
         ret=1
         continue
     fi
@@ -132,10 +194,18 @@ for vol in q a; do
             if e umount -R $dir; then
                 unmounted+=($dir)
             else
-                umount_ret=false
-                ret=1
-                echo "$0: failed to umount $dir"
-                break
+                if ! kill-dir TERM TERM TERM INT INT HUP HUP; then
+                    if $force; then  kill-dir KILL; fi
+                fi
+
+                if e umount -R $dir; then
+                    unmounted+=($dir)
+                else
+                    echo "$0: failed to umount $dir"
+                    umount_ret=false
+                    ret=1
+                    continue
+                fi
             fi
         fi
     done
@@ -147,14 +217,15 @@ for vol in q a; do
         continue
     fi
 
+    # todo: decipher /mnt/root, like we do in check-subvol-stale
     cd /mnt/root
     if [[ -e $vol ]]; then
-        e btrfs sub del $vol
+        e mv $vol $vol.leaf.$(date +%Y%m%dT%H%M%S%z)
     fi
     # Note, we make a few assumptions in this script, like
     # $d was not a different subvol id than $vol, and
     # things otherwise didn't get mounted very strangely.
-    e btrfs sub snapshot btrbk/$last_snap $vol
+    e btrfs sub snapshot $fresh_snap $vol
     for dir in $d ${binds[@]}; do
         e mnt $dir
     done
@@ -162,7 +233,8 @@ for vol in q a; do
     rm -f $stale_dir/$d
 done
 
-if [[ $HOSTNAME == treetowl ]]; then
+### disabled
+if [[ $HOSTNAME == treetowlxxxxxxxxx ]]; then
     # partitioned it with fai partitioner outside of fai,
     # because it\'s worth it to have 1% space reserved for boot and
     # swap partitions in case I ever want to boot off those drives.