aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>2016-01-29 17:53:24 +0100
committerJörgen Karlsson <jorgen.w.karlsson@ericsson.com>2016-01-29 17:02:43 +0000
commite4bdace33bfe68bf3efd5a50a73d8553bd8beb73 (patch)
tree7d34b300cb3ed3051efba169b79f493ad040e4aa /tools
parentb069a1e71e2b9af4f5af4a545592b450240874c1 (diff)
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)
Diffstat (limited to 'tools')
-rwxr-xr-xtools/yardstick-img-modify6
1 files changed, 5 insertions, 1 deletions
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