various fixes

[distro-setup] / mount-latest-subvol

diff --git a/mount-latest-subvol b/mount-latest-subvol
index a8ff06d0b96082cbc1779ac3d653cb6451d16430..c43bb587e150ff5de248f7cce52f8f76d95c12ca 100644 (file)
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -85,14 +85,15 @@ case $HOSTNAME in
     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
 ##### end setup fstab for subvols we care about ######
 
-for vol in q a m; do
+for vol in q a o; do
     d=/$vol
     if ! awk '{print $2}' /etc/fstab | grep -xF $d &>/dev/null; then
         continue