From 3d24cae4b9897c17ddcfc4c4d8f150931d2d1f98 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Thu, 28 Apr 2016 00:21:24 -0400 Subject: more samizdat-eject fixes also, copy samizdat-eject from the initramfs to the new rootfs (into /sbin) --- old-school/mdadm-dup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'old-school/mdadm-dup.sh') diff --git a/old-school/mdadm-dup.sh b/old-school/mdadm-dup.sh index fe18e92..c13a325 100644 --- a/old-school/mdadm-dup.sh +++ b/old-school/mdadm-dup.sh @@ -38,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" } @@ -54,7 +54,7 @@ dm_snapshot_teardown() # 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" || exit 1 + eject /dev/block/"$ro_dev" || true ) || return ;; *) return 1 ;; @@ -106,7 +106,7 @@ mdadm_dup() { local input_dev="$1" md_name="$2" sectors="$3" - mdadm --build $md_name ${sectors:+--size=$((sectors / 2))} \ + mdadm --build "$md_name" "${sectors:+--size=$((sectors / 2))}" \ --level=1 --raid-devices=1 --force --write-mostly "$input_dev" || return } @@ -132,6 +132,7 @@ cryptsetup_temp() set $parms wait_for_dm_device /dev/mapper/"$cryptname" + rm "$temp_file" echo /dev/mapper/"$cryptname" } @@ -140,7 +141,6 @@ mdadm_copy_eject_crypt() local md_dev="$1" temp_file="$2" [ -b "$md_dev" ] || return - [ ! -e "$temp_file" ] || return local output_dev sectors -- cgit v1.2.3