diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-03-17 16:05:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-17 16:05:12 +0000 |
| commit | 4b39c3a399437e3d990ec1c22fc9e405368ddbf2 (patch) | |
| tree | 405c17661362251274a1b14a071524288bbfe3bb | |
| parent | cf967b8bf46b5b1ea77b5ca9a8ccee00fbb1e1d6 (diff) | |
| parent | bd90c394fe223c5d465d70fb24076ef1d9258c91 (diff) | |
Merge "Bugfix: yardstick-image built without test tools"
| -rwxr-xr-x | tools/yardstick-img-modify | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify index da8e1c92f..b4f632bb2 100755 --- a/tools/yardstick-img-modify +++ b/tools/yardstick-img-modify @@ -109,13 +109,9 @@ setup() { fi mkdir -p $mountdir - #kpartx fails with image paths longer than 63 characters - #try shortest relative path to image as temporary workaround - cd ${workspace} - loopdevice=$(kpartx -l $raw_imgfile_basename | head -1 | cut -f1 -d ' ') + loopdevice=$(kpartx -l $raw_imgfile | head -1 | cut -f1 -d ' ') - kpartx -av $raw_imgfile_basename - cd - + kpartx -av $raw_imgfile if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then e2fsck -p -f /dev/mapper/$loopdevice |