various fixes

[distro-setup] / mount-latest-subvol

diff --git a/mount-latest-subvol b/mount-latest-subvol
index e1d4d1a74d56f4830d2de8319155cbfc51846ec5..033d9b8ba54ecc513c5a2c36818b7f27c06d21f7 100644 (file)
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -221,7 +221,7 @@ for vol in q a o i; do
   # if latest is already mounted, make sure binds are mounted and move on
   e check-subvol-stale $d
   # populated by check-subvol-stale if stale
-  if ! fresh_snap=$(</nocow/btrfs-stale/$vol); then
+  if ! fresh_snap=$(cat /nocow/btrfs-stale/$vol 2>/dev/null); then
     mnt $d
     for b in ${binds[@]}; do
       mnt $b