samizdat-eject improvements

1 files changed, 14 insertions, 5 deletions

diff --git a/samizdat-eject.sh b/samizdat-eject.sh
index ac2ebc3..e9e71e5 100755
--- a/samizdat-eject.sh
+++ b/samizdat-eject.sh
@@ -1,4 +1,15 @@
 #!/bin/sh
+die()
+{
+    printf '%s\n' "$*" >&2
+    exit 1
+}
+
+target=$1
+
+[ "$target" ] || die "Usage: $0 <target filename>"
+[ ! -e "$target" ] || die "Error: file exists: $target"
+
 
 . mdadm-dup.sh || exit 1
 
@@ -10,10 +21,6 @@ btrfs_subdevices()
 
 devices=$(btrfs_subdevices /) || exit 1
 
-target=$1
-
-[ -e "$target" ] && exit 1
-
 set --
 seen=
 for dev in $devices; do
@@ -23,7 +30,7 @@ for dev in $devices; do
         /dev/mapper/samizdatcrypt) seen=y ;;
     esac
 done
-[ "$seen" ] || exit 1
+[ "$seen" ] || set -- # avoid messing up someone's btrfs!
 
 copy()
 {
@@ -34,6 +41,8 @@ remove()
 {
     for dev; do
         (set -x; btrfs device remove "$dev" /)
+        dmsetup remove "$dev"
+        losetup -D
     done
 }