various fixes

[distro-setup] / mount-latest-subvol

diff --git a/mount-latest-subvol b/mount-latest-subvol
index 6a714d1a791ff8a67d4901f9654b5a049f93ccfd..f62f1f45612d274f1bf8196e9971973d10bba356 100644 (file)
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -44,8 +44,20 @@ bash-trace() {
 }
 errcatch
 
-
+tu() {
+    while read -r line; do
+        file="$1"
+        grep -xFq "$line" "$file" || tee -a "$file"<<<"$line"
+    done
+}
 e() { printf "%s\n" "$*"; "$@"; }
+mnt() {
+    dir=$1
+    if ! mountpoint $dir >/dev/null; then
+        mkdir -p $dir
+        e mount $dir
+    fi
+}
 
 ret=0
 
@@ -90,8 +102,6 @@ EOF
 
 fi
 
-mkdir -p /q /p /i
-
 for vol in q p; do
     d=/$vol
     if ! awk '{print $2}' /etc/fstab | grep -xF $d &>/dev/null; then
@@ -105,7 +115,7 @@ for vol in q p; do
         new_roots=()
         for r in ${roots[@]}; do
             # /q/a  /a  none  bind  0 0
-            new_roots+=($(sed -rn "s#^$r/\S+\s+(\S+)\s+none\s+bind\s.*#\1#" /etc/fstab))
+            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[@]})
@@ -114,7 +124,7 @@ for vol in q p; do
 
     if e check-subvol-stale $d; then
         for b in ${binds[@]}; do
-            mount $b
+            mnt $b
         done
         continue
     fi
@@ -142,7 +152,7 @@ for vol in q p; do
 
     if ! $umount_ret; then
         for dir in ${unmounted[@]}; do
-            mount $dir
+            mnt $dir
         done
         ret=1
         continue
@@ -157,7 +167,7 @@ for vol in q p; do
     # things otherwise didn't get mounted very strangely.
     e btrfs sub snapshot btrbk/$last_snap $vol
     for dir in $d ${binds[@]}; do
-        e mount $dir
+        e mnt $dir
     done
 done
 exit $ret