lots of fixes

[distro-setup] / mount-latest-subvol

diff --git a/mount-latest-subvol b/mount-latest-subvol
index e1d4d1a74d56f4830d2de8319155cbfc51846ec5..359b534337669090503de236c2ab30467c35b4dd 100644 (file)
--- a/mount-latest-subvol
+++ b/mount-latest-subvol
@@ -130,7 +130,14 @@ ret=0
 
 ##### begin setup fstab for subvols we care about ######
 root_dev=$(awk '$2 == "/" {print $1}' /etc/mtab)
-
+if [[ $root_dev == /dev/dm-* ]]; then
+  for d in /dev/mapper/*; do
+    if [[ $(readlink -f $d) == $root_dev ]]; then
+      root_dev=$d
+      break
+    fi
+  done
+fi
 
 if cryptsetup status $root_dev &>/dev/null; then
   crypt_dev=$root_dev
@@ -221,7 +228,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