X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=mount-latest-subvol;h=ded8ee931e0e306d46bcec7d9000754bad185605;hb=HEAD;hp=c66eebc1bd0a97d9cb8513cbedc2a4d4b9faf8ae;hpb=50f25d1eec109c4596cfc638c9a7c98da0f0b5d0;p=distro-setup

diff --git a/mount-latest-subvol b/mount-latest-subvol
index c66eebc..433c7c2 100644
--- 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
+shopt -s nullglob
 
 usage() {
   cat <<EOF
@@ -176,7 +177,11 @@ done
 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 ########
@@ -237,7 +242,6 @@ fstab <<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
@@ -263,7 +267,7 @@ fi
 # fa=(/mnt/root/btrbk/ar.*); f=${fa[0]}
 # if [[ -e $f ]]; then
 #   fstab <<EOF
-# $crypt_dev  /ar  btrfs  noatime,subvol=ar,uid=1000$mopts  0 0
+# $crypt_dev  /ar  btrfs  noatime,subvol=ar$mopts  0 0
 # EOF
 # fi
 
@@ -271,8 +275,10 @@ fi
 fa=(/mnt/o/btrbk/o.*); f=${fa[0]}
 if [[ -e $f ]]; then
   if [[ $o_dev != "$root_dev" ]]; then
+    # ,compress=zstd regardless of mopts since these are all text files
+    # and it cuts disk use by about half.
     fstab <<EOF
-$o_dev  /o  btrfs  noatime,subvol=o$mopts  0 0
+$o_dev  /o  btrfs  noatime,subvol=o${mopts/,compress=zstd/},compress=zstd  0 0
 EOF
   fi
   fstab <<EOF