iankelling.org
/
git
/
distro-setup
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
86c0ed3
)
minor fix
author
Ian Kelling
<ian@iankelling.org>
Fri, 19 Apr 2024 03:23:05 +0000
(23:23 -0400)
committer
Ian Kelling
<ian@iankelling.org>
Fri, 19 Apr 2024 03:23:05 +0000
(23:23 -0400)
mount-latest-subvol
patch
|
blob
|
history
diff --git
a/mount-latest-subvol
b/mount-latest-subvol
index eb682f4eebf54212768eb03c0c0a07e4f6114879..1f4229e5a9095f5bb28751e16ae12e2dcd1f63b2 100644
(file)
--- a/
mount-latest-subvol
+++ b/
mount-latest-subvol
@@
-24,6
+24,7
@@
cd /
[[ $EUID == 0 ]] || exec sudo -E "$this_file" "$@"
set -e; . /usr/local/lib/bash-bear; set +e
[[ $EUID == 0 ]] || exec sudo -E "$this_file" "$@"
set -e; . /usr/local/lib/bash-bear; set +e
+shopt -s nullglob
usage() {
cat <<EOF
usage() {
cat <<EOF
@@
-176,7
+177,11
@@
done
if (( $# )); then
all_vols=( "$@" )
else
if (( $# )); then
all_vols=( "$@" )
else
- all_vols=(q a o i ar qd qr)
+ all_vols=(q a o i qd qr)
+ ar_snaps=(/mnt/root/btrbk/ar.*)
+ if [[ -e /mnt/root/ar ]] || (( ${#ar_snaps[@]} > 0 )); then
+ all_vols+=(ar)
+ fi
fi
##### end command line parsing ########
fi
##### end command line parsing ########
@@
-237,7
+242,6
@@
fstab <<EOF
$crypt_dev /a btrfs noatime,subvol=a$mopts 0 0
EOF
$crypt_dev /a btrfs noatime,subvol=a$mopts 0 0
EOF
-shopt -s nullglob
# ssh and probably some other things care about parent directory
# ownership, and ssh doesn\'t allow any group writable parent
# ssh and probably some other things care about parent directory
# ownership, and ssh doesn\'t allow any group writable parent