samizdat-eject

1 files changed, 15 insertions, 8 deletions

diff --git a/old-school/mdadm-dup.sh b/old-school/mdadm-dup.sh
index c13a325..70163a5 100644
--- a/old-school/mdadm-dup.sh
+++ b/old-school/mdadm-dup.sh
@@ -48,13 +48,20 @@ dm_snapshot_teardown()
     case "$dev" in
         /dev/dm-*)
             dmsetup table "$dev" | (
-                read _ _ snapshot ro_dev rw_dev _ _
-                [ "$snapshot" = snapshot ]      || exit 1
-                dmsetup remove "$dev"           || exit 1
-                # errors ignored because the loop dev can be configured to be
-                # automatically removed upon disuse
-                losetup -d /dev/block/"$rw_dev" || true
-                eject /dev/block/"$ro_dev"      || true
+                read _ _ snapshot ro_dev rw_dev _ crypt_dev _
+                case "$snapshot" in
+                    snapshot)
+                        dmsetup remove "$dev"           || exit 1
+                        # errors ignored because the loop dev can be configured to be
+                        # automatically removed upon disuse
+                        losetup -d /dev/block/"$rw_dev" || true
+                        eject /dev/block/"$ro_dev"      || true
+                        ;;
+                    crypt)
+                        cryptsetup remove "$dev" || exit 1
+                        losetup -d /dev/block/"$crypt_dev" || true
+                        ;;
+                esac
             ) || return
             ;;
         *) return 1 ;;
@@ -129,7 +136,7 @@ cryptsetup_temp()
     printf %s "$secret" |
         cryptsetup --key-file - luksOpen "$cleartext_dev" "$cryptname" || return
     unset secret
-    set $parms
+    set "$parms"
 
     wait_for_dm_device /dev/mapper/"$cryptname"
     rm "$temp_file"