improve licensing

[distro-setup] / mount-latest-subvol

diff --git a/mount-latest-subvol b/mount-latest-subvol
index cad9e1cac53e1e60b144e3d257f658b89ce72443..af6385e9ab36396c77f6baf6fc26285ef59cdf7b 100644 (file)
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -18,7 +18,7 @@ readonly this_file
 cd /
 [[ $EUID == 0 ]] || exec sudo -E "$this_file" "$@"
 
-source /usr/local/lib/err
+set -e; . /usr/local/lib/bash-bear; set +e
 
 usage() {
   cat <<EOF
@@ -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
@@ -254,12 +254,13 @@ $crypt_dev  /qr  btrfs  noatime,subvol=qr$mopts  0 0
 EOF
 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
-EOF
-fi
+# not syncing ar at the moment
+# 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
+# EOF
+# fi
 
 
 fa=(/mnt/o/btrbk/o.*); f=${fa[0]}