diff options
| author |   Ryan.RCS <lihainong@huawei.com> | 2016-12-21 02:29:41 +0000 |
|---|---|---|
| committer | Ryan.RCS <lihainong@huawei.com> | 2016-12-21 02:29:41 +0000 |
| commit | 6b04f5552159c2c34486178fba34dd57b4eaca27 (patch) | |
| tree | cc1706b24ceaea83639d7334643408f63e507f74 /tools | |
| parent | 367691281be05a5f2c76455465ff14078415e6c2 (diff) | |
fixed issue in yardstick-img-modify cleanup() fun
1. when run yardstick-img-modify script, sometimes it show below error.
+ '[' -f /tmp/workspace/yardstick/yardstick-xenial-server.raw ']'
+ kpartx -dv /tmp/workspace/yardstick/yardstick-xenial-server.raw
ioctl: LOOP_CLR_FD: No such device or address
del devmap : loop0p1
can't del loop : /dev/loop0
+ test 1 -eq 1 -o 1 -eq 2
2. so i added a expression to check if the .raw file map deleted or not
3. if the devmap not deleted, then we delete it, otherwise, we do nothing
JIRA: YARDSTICK-502
Change-Id: Ia050121ed6bf837bab05e38f2e9e9628ca31627a
Signed-off-by: Ryan.RCS <lihainong@huawei.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/yardstick-img-modify | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify index 0033383ef..1743d908a 100755 --- a/tools/yardstick-img-modify +++ b/tools/yardstick-img-modify @@ -152,9 +152,13 @@ cleanup() { mount | grep $mountdir/proc && umount $mountdir/proc mount | grep $mountdir && umount $mountdir mount | grep "/mnt/vivid" && umount "/mnt/vivid" + if [ -f $raw_imgfile ]; then - kpartx -dv $raw_imgfile + if [ -z "$(kpartx -l $raw_imgfile | grep 'loop deleted')" ]; then + kpartx -dv $raw_imgfile + fi fi + rm -f $raw_imgfile rm -rf $mountdir } |