X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=mount-latest-subvol;h=091cf44448d4cace3675056a015f179f9cfa2989;hb=28d76e1e82027ad40d7ec48ff68839f1f035b7b1;hp=73709316d39b79dac8865aef265b0496574d0fc2;hpb=9eeed9d8bd24850fe5e35d2c2f9be8608491bf70;p=distro-setup

diff --git a/mount-latest-subvol b/mount-latest-subvol
index 7370931..091cf44 100644
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -1,4 +1,19 @@
 #!/bin/bash
+# Copyright (C) 2016 Ian Kelling
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
 
 [[ $EUID == 0 ]] || exec sudo -E "$BASH_SOURCE" "$@"
 
@@ -53,7 +68,7 @@ tu() {
 e() { printf "%s\n" "$*"; "$@"; }
 mnt() {
     dir=$1
-    if ! mountpoint $dir >/dev/null; then
+    if ! mountpoint $dir &>/dev/null; then
         mkdir -p $dir
         e mount $dir
     fi
@@ -63,18 +78,18 @@ ret=0
 
 first_root_crypt=$(awk '$2 == "/" {print $1}' /etc/mtab)
 tu /etc/fstab <<EOF
-$first_root_crypt  /q  btrfs  noatime,subvol=q  0 0
-/q/a  /a  none  bind  0 0
+$first_root_crypt  /a  btrfs  noatime,subvol=a  0 0
 EOF
 case $HOSTNAME in
     treetowl|x2|frodo)
         tu /etc/fstab <<EOF
-$first_root_crypt  /p  btrfs  noatime,subvol=p  0 0
+$first_root_crypt  /q  btrfs  noatime,subvol=q  0 0
+/q/p  /p  none  bind  0 0
 EOF
         ;;
 esac
 
-for vol in q p; do
+for vol in q a; do
     d=/$vol
     if ! awk '{print $2}' /etc/fstab | grep -xF $d &>/dev/null; then
         continue
@@ -86,7 +101,8 @@ for vol in q p; do
     while true; do
         new_roots=()
         for r in ${roots[@]}; do
-            # /q/a  /a  none  bind  0 0
+            # example
+            # /q/p  /p  none  bind  0 0
             new_roots+=($(sed -rn "s#^$r/\S+\s+(\S+)\s+none\s+bind\s.*#\1#p" /etc/fstab))
         done
         (( ${#new_roots} )) || break
@@ -94,6 +110,7 @@ for vol in q p; do
         roots=( ${new_roots[@]} )
     done
 
+    # if latest is already mounted, make sure binds are mounted and move on
     if e check-subvol-stale $d; then
         for b in ${binds[@]}; do
             mnt $b
@@ -116,6 +133,7 @@ for vol in q p; do
                 unmounted+=($dir)
             else
                 umount_ret=false
+                ret=1
                 echo "$0: failed to umount $dir"
                 break
             fi
@@ -126,7 +144,6 @@ for vol in q p; do
         for dir in ${unmounted[@]}; do
             mnt $dir
         done
-        ret=1
         continue
     fi
 
@@ -141,6 +158,8 @@ for vol in q p; do
     for dir in $d ${binds[@]}; do
         e mnt $dir
     done
+    stale_dir=/nocow/btrfs-stale
+    rm -f $stale_dir/$d
 done
 
 if [[ $HOSTNAME == treetowl ]]; then
@@ -178,10 +197,8 @@ EOF
             cryptdisks_start crypt_dev_$dev
         fi
     done
-else
-    tu /etc/fstab <<'EOF'
-/q/i  /i  none  bind,noauto  0 0
-EOF
+    # note, could do an else here and have some kind of mount for /i
+    # on other hosts.
 fi
 
 exit $ret