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
treetowl|x2|frodo)
tu /etc/fstab <<EOF
$first_root_crypt /q btrfs noatime,subvol=q 0 0
-$first_root_crypt /m btrfs noatime,subvol=m 0 0
+$first_root_crypt /o btrfs noatime,subvol=o 0 0
/q/p /p none bind 0 0
+/o/m /m none bind 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 m; do
+for vol in q a o i; do
d=/$vol
if ! awk '{print $2}' /etc/fstab | grep -xF $d &>/dev/null; then
continue
# 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
if e umount -R $dir; then
unmounted+=($dir)
else
- umount_ret=false
- ret=1
echo "$0: failed to umount $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
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
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.