summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJingLu5 <lvjing5@huawei.com>2017-03-17 02:08:55 +0000
committerJing Lu <lvjing5@huawei.com>2017-03-17 16:05:26 +0000
commitc8e994e1963e7cc191c4b3ad9fd26d2ae7b80025 (patch)
treefbef1c7329aeb4a0d28b653a4606209f3633a915 /tools
parent1ffaf9851b2695bd9129cfe20afe834a9d732adb (diff)
Bugfix: yardstick-image built without test tools
JIRA: YARDSTICK-593 The yardstick-image now built dosen't have test tools in it. This patch aims to fix this issus. Change-Id: I9863a933106236835c16e21f84aa107ffd554df7 Signed-off-by: JingLu5 <lvjing5@huawei.com> (cherry picked from commit bd90c394fe223c5d465d70fb24076ef1d9258c91)
Diffstat (limited to 'tools')
-rwxr-xr-xtools/yardstick-img-modify8
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