fix rootfinding logic when readonly (-r) is specified (and therefore root subvolume will not be listed)

1 files changed, 15 insertions, 6 deletions

diff --git a/list-all-subvolumes b/list-all-subvolumes
index ec042c7..fc19b69 100755
--- a/list-all-subvolumes
+++ b/list-all-subvolumes
@@ -30,13 +30,22 @@ extract_subvolume_path()
         [ "$path" != "$REPLY" ]
         path=${path#<FS_TREE>/}
 
-        abspath=$1/$path
-        [ -d "$abspath" ] || exit
+        tryroot=$1/$path
+        [ -d "$tryroot" ] || exit
 
-        if [ ! "$root" -a "$abspath" -ef / ]
-        then
-            root=$path
-        fi
+        while ! [ "$root" ]
+        do
+            if [ / -ef "$tryroot" ]
+            then
+                root=${tryroot#$1/}
+                break
+            elif [ "$tryroot" = / ]
+            then
+                break
+            else
+                tryroot=${tryroot%/*}
+            fi
+        done
         case "$path" in
             "$root" | "$root"/*) path=$root/.${path#$root} ;;
         esac