move some stuff to frodo, rename user to iank, fixes

[distro-setup] / mount-latest-subvol

diff --git a/mount-latest-subvol b/mount-latest-subvol
index 6bf68d703b7f90b3a2379ceeeca1335991afcfc6..e4c4d6b0a652b992f6feb7483cecd394bbf1040c 100644 (file)
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -91,9 +91,14 @@ $first_root_crypt  /o  btrfs  noatime,subvol=o  0 0
 EOF
         ;;
 esac
+if [[ $HOSTNAME == frodo ]]; then
+    tu /etc/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 o; do
+for vol in q a o i; do
     d=/$vol
     if ! awk '{print $2}' /etc/fstab | grep -xF $d &>/dev/null; then
         continue
@@ -141,11 +146,23 @@ for vol in q a o; do
             if e umount -R $dir; then
                 unmounted+=($dir)
             else
-                umount_ret=false
-                ret=1
                 echo "$0: failed to umount $dir"
-                e lsof $dir
-                break
+                # lsof will fail if it finds no pids
+                if ! e lsof $dir; then
+                    umount_ret=false
+                    ret=1
+                    continue
+                fi
+                pids=$(lsof -t $dir) ||:
+                kill $pids
+                sleep .5
+                if e umount -R $dir; then
+                    unmounted+=($dir)
+                else
+                    umount_ret=false
+                    ret=1
+                    continue
+                fi
             fi
         fi
     done