add copyright headers, fix a few things

[distro-setup] / mount-latest-subvol

diff --git a/mount-latest-subvol b/mount-latest-subvol
index 73709316d39b79dac8865aef265b0496574d0fc2..49ddcd594d39842306b1cc5d82f1d6e947c64dfc 100644 (file)
--- 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" "$@"
 
@@ -94,6 +109,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 +132,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 +143,6 @@ for vol in q p; do
         for dir in ${unmounted[@]}; do
             mnt $dir
         done
-        ret=1
         continue
     fi
 
@@ -141,6 +157,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