From d693431e2574209296e112d28f67f586deb8bcbd Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Mon, 15 May 2017 16:33:44 +0200
Subject: [PATCH] fixup! proper partx support

---
 zlibs/helpers | 2 ++
 zlibs/imaging | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/zlibs/helpers b/zlibs/helpers
index 0b30d09..6c0d61f 100644
--- a/zlibs/helpers
+++ b/zlibs/helpers
@@ -19,6 +19,8 @@
 
 ## helper functions that make my life easier
 
+vars+=(loopdevice)
+
 build_image_dist() {
 	fn build_image_dist
 	req=(arch size parted_type)
diff --git a/zlibs/imaging b/zlibs/imaging
index dce77d6..c5719f6 100644
--- a/zlibs/imaging
+++ b/zlibs/imaging
@@ -48,9 +48,8 @@ image_partition_raw_dos() {
 	## get loopdevice (see ./helpers)
 	findloopdev
 
-	mappdevice="/dev/mapper/${mappdevice}"
-	bootpart=${mappdevice}p1
-	rootpart=${mappdevice}p2
+	bootpart=${loopdevice}p1
+	rootpart=${loopdevice}p2
 
 	notice "formatting partitions..."
 	sudo mkfs.vfat ${bootpart}
@@ -79,8 +78,8 @@ image_partition_raw_gpt() {
 
 	findloopdev
 
-	bootpart=${loopdevice}p1
-	rootpart=${loopdevice}p2
+	bootpart="${loopdevice}p1"
+	rootpart="${loopdevice}p2"
 
 	notice "formatting partitions..."
 	sudo mkfs.ext4 -L rootfs ${rootpart}