From c1c6fc8c0686ecdb30da61775f9015798133fb15 Mon Sep 17 00:00:00 2001
From: parazyd <parazyd@dyne.org>
Date: Mon, 8 Oct 2018 15:45:37 +0200
Subject: [PATCH] Fix path to base-cloud.qcow2 and use [[ instead of [ for
 test.

---
 zlibs/vm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/zlibs/vm b/zlibs/vm
index 4aebc7f..999b1fe 100644
--- a/zlibs/vm
+++ b/zlibs/vm
@@ -174,8 +174,8 @@ vm_init_cloud() {
 	req=(workdir strapdir imageformat loopdevice)
 	ckreq || return 1
 
-	[ -n "$makecloud" ] || return
-	[ "$imageformat" = qcow2 ] || {
+	[[ -n "$makecloud" ]] || return
+	[[ "$imageformat" = qcow2 ]] || {
 		die "imageformat is not qcow2"
 		zerr
 	}
@@ -187,6 +187,7 @@ vm_init_cloud() {
 	notice "Connecting qemu-nbd and mounting"
 	sudo mkdir -p "$strapdir"
 	sudo qemu-nbd --connect=${loopdevice} base-cloud.qcow2 || zerr
+	silly sleep 1
 	sudo mount ${loopdevice}p1 $strapdir || zerr
 
 	notice "Installing cloud-init"
@@ -213,8 +214,9 @@ vm_pack_dist() {
 	mv $workdir/base.${imageformat} $R/dist/${vm_name}.${imageformat}
 	cp $workdir/base.vdi $R/dist/${vm_name}.vdi
 
-	[ -n "$makecloud" ] && \
-		mv base-cloud.${imageformat} $R/dist/${vm_name}-cloud.${imageformat}
+	[[ -n "$makecloud" ]] && \
+		mv $workdir/base-cloud.${imageformat} \
+			$R/dist/${vm_name}-cloud.${imageformat}
 
 	act "calculating sha256 sums..."
 	silly
@@ -224,7 +226,7 @@ vm_pack_dist() {
 		$R/dist/${vm_name}.${imageformat}.sha
 	sha256sum $R/dist/${vm_name}.vdi > \
 		$R/dist/${vm_name}.vdi.sha
-	[ -n "$makecloud" ] && \
+	[[ -n "$makecloud" ]] && \
 		sha256sum $R/dist/${vm_name}-cloud.${imageformat} > \
 			$R/dist/${vm_name}-cloud.${imageformat}.sha