handle multiple simultaneous runs and clean up everything

1 files changed, 3 insertions, 2 deletions

diff --git a/list-all-subvolumes b/list-all-subvolumes
index a5f79cf..2acf772 100755
--- a/list-all-subvolumes
+++ b/list-all-subvolumes
@@ -7,10 +7,11 @@ list_all_subvolumes()
     for dev in $(list_btrfs)
     do
         [ -b "$dev" ] || return
-        d=/run/btrfs-temp-mount/$(systemd-escape "$dev")
+        d=btrfs/$$/$(systemd-escape "$dev")
         (
+            cd /run
             mkdir -p "$d" || exit
-            trap 'umount "$d"; rmdir "$d"' EXIT
+            trap 'umount "$d"; rmdir -p "$d" 2>/dev/null' EXIT
             set -x
             mountpoint -q "$d" || mount -o ro,subvol=/ "$dev" "$d" || return
             btrfs subvolume list "$@" "$d"