ext: Only mount with bindfs if different uid

cdown · Dec 30, 2023 · 9e4c14b · 9e4c14b
1 parent dc3dec9
commit 9e4c14b
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/bin/ext b/bin/ext
@@ -29,12 +29,24 @@ case ${1?} in
         sudo enable-usb-trim "$device"
 
         sudo cryptsetup luksOpen --allow-discards "$part" "$label"
+
         sudo mount /dev/mapper/"$label" /mnt/scratch-baduser
-        sudo bindfs -u "$(id -u)" --create-for-user="$(stat -c %u /mnt/scratch-baduser)" /mnt/scratch-baduser /mnt/scratch
+
+        cur_uid=$(id -u)
+        mount_uid=$(stat -c %u /mnt/scratch-baduser)
+
+        if (( cur_uid == mount_uid )); then
+            sudo umount /mnt/scratch-baduser
+            sudo mount /dev/mapper/"$label" /mnt/scratch
+        else
+            sudo bindfs -u "$(id -u)" --create-for-user="$(stat -c %u /mnt/scratch-baduser)" /mnt/scratch-baduser /mnt/scratch
+        fi
     ;;
     unmount)
         sudo umount /mnt/scratch
-        sudo umount /mnt/scratch-baduser
+        if mountpoint -q /mnt/scratch-baduser; then
+            sudo umount /mnt/scratch-baduser
+        fi
         sudo cryptsetup luksClose "$label"
     ;;
     *)