From bcfc231bdd21f9bde26a8409d6a8542e3602bc0b Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Mon, 15 May 2017 16:05:03 +0200
Subject: [PATCH] proper partx support

---
 zlibs/helpers |  9 +++------
 zlibs/imaging | 11 +++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/zlibs/helpers b/zlibs/helpers
index c9c0253..0b30d09 100644
--- a/zlibs/helpers
+++ b/zlibs/helpers
@@ -143,20 +143,17 @@ wrapup() {
 	exit 1
 }
 
-findloopmapp() {
-	fn findloopmapp
+findloopdev() {
+	fn findloopdev
 	req=(workdir image_name)
 	ckreq || return 1
 
 	notice "finding a free loopdevice"
 
 	loopdevice=$(sudo losetup -f --show $workdir/${image_name}.img)
-	mappdevice=$(sudo partx -va $loopdevice | \
-		sed -E 's/.*(loop[0-9])p.*/\1/g' | sed 1q)
+	sudo partx -av $loopdevice || zerr
 
 	func "loopdevice: $loopdevice"
-	func "mappdevice: $mappdevice"
-
 	silly sleep 2
 }
 
diff --git a/zlibs/imaging b/zlibs/imaging
index 50f4d0a..dce77d6 100644
--- a/zlibs/imaging
+++ b/zlibs/imaging
@@ -45,8 +45,8 @@ image_partition_raw_dos() {
 	parted $workdir/${image_name}.img --script -- mkpart primary ${parted_boot}
 	parted $workdir/${image_name}.img --script -- mkpart primary ${parted_root}
 
-	## get loopdevice and mapper device (see ./helpers)
-	findloopmapp
+	## get loopdevice (see ./helpers)
+	findloopdev
 
 	mappdevice="/dev/mapper/${mappdevice}"
 	bootpart=${mappdevice}p1
@@ -77,11 +77,10 @@ image_partition_raw_gpt() {
 		awk '/Sec GPT table/ {print $1}') - ${gpt_root[1]}) \
 		-l Root $workdir/${image_name}.img
 
-	findloopmapp
+	findloopdev
 
-	mappdevice="/dev/mapper/${mappdevice}"
-	bootpart=${mappdevice}p1
-	rootpart=${mappdevice}p2
+	bootpart=${loopdevice}p1
+	rootpart=${loopdevice}p2
 
 	notice "formatting partitions..."
 	sudo mkfs.ext4 -L rootfs ${rootpart}