summaryrefslogtreecommitdiffstats
path: root/tools/yardstick-img-modify
diff options
context:
space:
mode:
authorJing Lu <lvjing5@huawei.com>2017-03-22 07:49:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-22 07:49:14 +0000
commit9248c8219ef862295c10c86d0cd4a56038bce528 (patch)
treecf31d91336fadcc1fcac5716fdf2bc1929b5f57e /tools/yardstick-img-modify
parent87ebc303a99415e79f8df4c668a48ba7f3600ffb (diff)
parente28cbf3ddebc45a7b94e33df0c671d767e1ff7ad (diff)
Merge "aarch64: Fix missing qemu-aarch64-static in chroot" into stable/danube
Diffstat (limited to 'tools/yardstick-img-modify')
-rwxr-xr-xtools/yardstick-img-modify6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify
index 658717c71..2bb1ad447 100755
--- a/tools/yardstick-img-modify
+++ b/tools/yardstick-img-modify
@@ -104,9 +104,6 @@ download() {
# mount image
setup() {
# qemu-img resize $raw_imgfile +5GB
- if [ "${YARD_IMG_ARCH}" = "arm64" ]; then
- echo -e "d\nn\np\n1\n\n\nw" | parted -l $raw_imgfile
- fi
mkdir -p $mountdir
loopdevice=$(kpartx -l $raw_imgfile | head -1 | cut -f1 -d ' ')
@@ -129,6 +126,9 @@ setup() {
cp $(which "qemu-aarch64-static") "$mountdir/usr/bin"
fi
cp $cmd $mountdir/$(basename $cmd)
+ if [ "${YARD_IMG_ARCH}" = "arm64" ]; then
+ cp /usr/bin/qemu-aarch64-static $mountdir/usr/bin
+ fi
}
# modify image running a script using in a chrooted environment