From: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
Date: Fri, 29 Jan 2016 16:53:24 +0000 (+0100)
Subject: Add debug info to solve image build errors
X-Git-Tag: brahmaputra.1.0~36
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F8611%2F1;p=yardstick.git

Add debug info to solve image build errors

Add more debug output and clear devmap table in order to
solve build problems in YARDSTICK-226.

Change-Id: Idfdbb925501c8debb67406f2dd316e1d4bfbaaa8
JIRA: YARDSTICK-226
Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
(cherry picked from commit 8f6ecefac63f58bc988bc82ecc5247ec98a13d6e)
---

diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify
index 33065627f..5e9b45029 100755
--- a/tools/yardstick-img-modify
+++ b/tools/yardstick-img-modify
@@ -104,6 +104,10 @@ modify() {
     umount $mountdir
 
     qemu-img convert -c -o compat=0.10 -O qcow2 $raw_imgfile $imgfile
+
+    if dmsetup table | grep $loopdevice; then
+       dmsetup clear $loopdevice || true
+    fi
 }
 
 # cleanup (umount) the image
@@ -112,7 +116,7 @@ cleanup() {
     mount | grep $mountdir/proc && umount $mountdir/proc
     mount | grep $mountdir && umount $mountdir
     if [ -f $raw_imgfile ]; then
-        kpartx -d $raw_imgfile || true
+        kpartx -dv $raw_imgfile || true
     fi
     rm -f $raw_imgfile
     rm -rf $mountdir