lots: shellcheck, streaming stuff, fixes

[distro-setup] / mount-latest-subvol

diff --git a/mount-latest-subvol b/mount-latest-subvol
index dfe65db1f1d15be994c9dc995b83d0d9ee3177bb..af6385e9ab36396c77f6baf6fc26285ef59cdf7b 100644 (file)
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -241,8 +241,8 @@ shopt -s nullglob
 fa=(/mnt/root/btrbk/q.*); f=${fa[0]}
 if [[ -e $f ]]; then
   fstab <<EOF
-$crypt_dev  /q  btrfs  noatime,subvol=q,gid=1000$mopts  0 0
-$crypt_dev  /qd  btrfs  noatime,subvol=qd,gid=1000$mopts  0 0
+$crypt_dev  /q  btrfs  noatime,subvol=q$mopts  0 0
+$crypt_dev  /qd  btrfs  noatime,subvol=qd$mopts  0 0
 /q/p  /p  none  bind$mopts  0 0
 EOF
 fi
@@ -258,7 +258,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,gid=1000$mopts  0 0
+# $crypt_dev  /ar  btrfs  noatime,subvol=ar,uid=1000$mopts  0 0
 # EOF
 # fi