fixup! Cdrom duplication

1 files changed, 15 insertions, 15 deletions

diff --git a/old-school/mdadm-dup.sh b/old-school/mdadm-dup.sh
index b1bcd33..fa38b51 100644
--- a/old-school/mdadm-dup.sh
+++ b/old-school/mdadm-dup.sh
@@ -1,3 +1,13 @@
+LoSetup()
+{
+    local losetup_binary="$(which LoSetup)"
+    if [ "$losetup_binary" ]; then
+        "$losetup_binary" "$@"
+    else
+        losetup "$@"
+    fi
+}
+
 dm_snapshot()
 {
     # TODO: eliminate duplication; this function exists elsewhere in a less generalized form
@@ -28,7 +38,7 @@ dm_snapshot()
     persist=p
     chunksize=16
     dmsetup create "$new_dev_name" --table "0 $size snapshot $ro_dev $rw_dev $persist $chunksize" || return
-    wait_for_dm_device /dev/mapper/"$new_dev_name"; 
+    wait_for_dm_device /dev/mapper/"$new_dev_name";
     echo /dev/mapper/"$new_dev_name"
 }
 
@@ -100,20 +110,10 @@ mdadm_dup()
           --level=1 --raid-devices=1 --force --write-mostly "$input_dev" || return
 }
 
-
 mdadm_subdevices()
 {
     local md_dev="$1"
-    mdadm -D "$md_dev" -Y | sed -ne 's/MD_DEVICE_.*_DEV=//p'
-}
-
-Mdadm()
-{
-    mdadm "$@"
-    # r=$?
-    # mdadm -D "$1"
-    # sleep 2
-    # return $r
+    mdadm -D "$md_dev" -Y | sed -ne 's/^MD_DEVICE_.*_DEV=//p'
 }
 
 mdadm_copy_eject() # NOT INITRD; uses non-busybox "losetup"
@@ -132,12 +132,12 @@ mdadm_copy_eject() # NOT INITRD; uses non-busybox "losetup"
     truncate -s $((sectors * 512)) "$output_file"     || return
     output_dev=$(losetup -f --show "$output_file")    || return
 
-    Mdadm "$md_dev" --add "$output_dev"               || return
-    Mdadm "$md_dev" --grow -n2                        || return
+    mdadm "$md_dev" --add "$output_dev"               || return
+    mdadm "$md_dev" --grow -n2                        || return
 
     mdadm_wait_remove "$md_dev" "$old_subdev"         || return
 
-    Mdadm "$md_dev" --grow -n1 --force                || return
+    mdadm "$md_dev" --grow -n1 --force                || return
     dm_snapshot_teardown "$old_subdev"
 }