More busybox compatibility changes

Changes:
 * Use short flags for BusyBox compatibility when needed.
 * test-growpart(-lvm): run `udevadm settle` only if available.
 * Drop `rm --one-file-system` flag in mount-image-callback's cleanup().
   We check for the return code of do_umounts() instead, and avoid
   removing files if something went wrong in the umount process.

Author: paride

bin/mount-image-callback

@@ -120,12 +120,11 @@ do_umounts() {
 cleanup() {
 	if [ "${#UMOUNTS[@]}" -ne 0 ]; then
 		debug 2 "umounts: ${UMOUNTS[*]}"
-		do_umounts "${UMOUNTS[@]}"
+		do_umounts "${UMOUNTS[@]}" ||
+			{ error "failed cleaning up mounts"; return 1; }
 	fi
 	disconnect_qemu
-	[ -z "${TEMP_D}" -o ! -d "${TEMP_D}" ] ||
-		rm --one-file-system -Rf "${TEMP_D}" ||
-		error "removal of temp dir failed!"
+	rm -Rf "$TEMP_D" || error "removal of temp dir failed!"
 }
 
 debug() {

test/test-growpart

@@ -20,8 +20,8 @@ cleanup() {
 		umount "$MP";
 	fi
 	if [ -n "$LODEV" ]; then
-		echo "losetup --detach $LODEV";
-		losetup --detach "$LODEV";
+		echo "losetup -d $LODEV";
+		losetup -d "$LODEV";
 	fi
 	[ ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}"
 }
@@ -30,6 +30,10 @@ rq() {
 	"$@" > "$out" 2>&1 || { echo "FAILED:" "$@"; cat "$out"; return 1; }
 }
 
+has_cmd() {
+	command -v "${1}" >/dev/null 2>&1
+}
+
 TEMP_D=$(mktemp -d ${TMPDIR:-/tmp}/${0##*/}.XXXXXX)
 trap cleanup EXIT
 
@@ -42,16 +46,17 @@ rm -f $img
 [ ! -e $mp ] || rmdir $mp || { echo "failed rmdir $mp"; exit 1; }
 mkdir $mp
 
-truncate --size $osize "$img"
+truncate -s $osize "$img"
 
 label_flag="--label=${PT_TYPE}"
 echo "2048," | rq sfdisk $label_flag --force --unit=S "$img"
 
-truncate --size "$size" "$img"
+truncate -s "$size" "$img"
 
-lodev=$(losetup --show --find --partscan "$img")
+lodev=$(losetup -f)
+losetup -P "$lodev" "$img"
 LODEV=$lodev
-udevadm settle
+! has_cmd udevadm || udevadm settle
 echo "set up $lodev"
 lodevpart="${lodev}p1"
 

test/test-growpart-fsimage

@@ -24,12 +24,12 @@ size=1000M
 osize=500M
 rm -f $img
 
-truncate --size $osize "$img"
+truncate -s $osize "$img"
 
 label_flag="--label=${PT_TYPE:-dos}"
 echo "2048," | rq sfdisk $label_flag --force --unit=S "$img"
 
-truncate --size "$size" "$img"
+truncate -s "$size" "$img"
 
 echo "==== before ===="
 sfdisk --list --unit=S "$img"

test/test-growpart-fsimage-middle

@@ -46,7 +46,7 @@ CR='
 for resizer in sfdisk sgdisk; do
 	img="${TEMP_D}/disk-$resizer.img"
 	echo "====== Testing with resizer=$resizer ====="
-	rq truncate "--size=2G" "$img"
+	rq truncate -s 2G "$img"
 	( cd ${TEMP_D} && rq setup_img "${img##*/}" ) || fail "setup image $img"
 	echo "==== before ===="
 	( cd "${TEMP_D}" && sfdisk --dump "${img##*/}" )

test/test-growpart-lvm

@@ -48,8 +48,8 @@ cleanup() {
 		rq lvm pvremove --force --yes "$PV"
 	fi
 	if [ -n "$LODEV" ]; then
-		echo "losetup --detach $LODEV";
-		losetup --detach "$LODEV";
+		echo "losetup -d $LODEV";
+		losetup -d "$LODEV";
 	fi
 	[ ! -d "${TEMP_D}" ] || rm -Rf "${TEMP_D}"
 }
@@ -67,6 +67,10 @@ get_vgsize() {
 	_RET="$out"
 }
 
+has_cmd() {
+	command -v "${1}" >/dev/null 2>&1
+}
+
 TEMP_D=$(mktemp -d ${TMPDIR:-/tmp}/${0##*/}.XXXXXX)
 trap cleanup EXIT
 
@@ -79,16 +83,17 @@ rm -f $img
 [ ! -e $mp ] || rmdir $mp || { echo "failed rmdir $mp"; exit 1; }
 mkdir $mp
 
-truncate --size $osize "$img"
+truncate -s $osize "$img"
 
 label_flag="--label=${PT_TYPE}"
 echo "2048," | rq sfdisk $label_flag --force --unit=S "$img"
 
-truncate --size "$size" "$img"
+truncate -s "$size" "$img"
 
-lodev=$(losetup --show --find --partscan "$img")
+lodev=$(losetup -f)
+losetup -P "$lodev" "$img"
 LODEV=$lodev
-udevadm settle
+! has_cmd udevadm || udevadm settle
 echo "set up $lodev"
 lodevpart="${lodev}p1"
 

test/test-growpart-overprovision

@@ -28,12 +28,12 @@ echo "Partitioning $PT_TYPE orig_size=$osize grow_size=$size, overprovisioning=$
 echo "growpart is $(which growpart)"
 rm -f $img
 
-truncate --size $osize "$img"
+truncate -s $osize "$img"
 
 label_flag="--label=${PT_TYPE}"
 echo "2048," | rq sfdisk $label_flag --force --unit=S "$img"
 
-truncate --size "$size" "$img"
+truncate -s "$size" "$img"
 
 echo "==== before ===="
 sfdisk --list --unit=S "$img"

test/test-growpart-start-matches-size

@@ -62,7 +62,7 @@ test_resize () {
         cd ${TEMP_D}
         echo "$expected" > partitions.expected
 
-        rq truncate "--size=2G" disk.img
+        rq truncate -s 2G disk.img
         rq setup_image || fail "setup image $img"
 
         sfdisk --dump disk.img > partitions.before

test/test-mic

@@ -78,8 +78,8 @@ echo "partition 2" > "$pt2_d/info.txt"
 ## Create 2 un-partitioned images, put a filesystem on them.
 ## And then mount them write a file, and then mount and
 ## read the file to verify its there.
-truncate "--size=$pt1_size" "$pt1"
-truncate "--size=$pt2_size" "$pt2"
+truncate -s "$pt1_size" "$pt1"
+truncate -s "$pt2_size" "$pt2"
 rq mkfs.ext4 -F "${pt1}"
 rq mkfs.ext4 -F "${pt2}"
 
@@ -160,8 +160,8 @@ mount-image-callback --read-only --cd -- "$pt1" sh -c '
 ## Stage 2
 ## Create a full disk image with those 2 partition images inside
 ## and a partition table that points to them.  Do one for MBR and GPT.
-truncate "--size=$prept_size" "$prept"
-truncate "--size=$postpt_size" "$postpt"
+truncate -s "$prept_size" "$prept"
+truncate -s "$postpt_size" "$postpt"
 
 msg "writing hunks to disk image ${img_mbr}"
 for hunk in "$prept" "$pt1" "$pt2" "$postpt"; do

tools/make-short-partition

@@ -10,7 +10,7 @@ set -e
 fail() { echo "$@" 1>&2; exit 1; }
 
 if [ ! -e "$disk" ]; then
-	truncate --size 1G "$disk"
+	truncate -s 1G "$disk"
 fi
 
 if [ -b "$disk" ]; then