Fix loop device name

In [1], ${loopdevice:0:5} is wrong when loopdevice is loop13p1.

[1] https://build.opnfv.org/ci/job/daisy-kolla-build-master/36/console

Change-Id: I3bfcf771c8b510f9c5c1f853a1a61a299106d5dc
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>

diff --git a/tools/daisy-img-modify.sh b/tools/daisy-img-modify.sh
index ff1ff43..6d2ff53 100755 (executable)
--- a/tools/daisy-img-modify.sh
+++ b/tools/daisy-img-modify.sh
@@ -165,8 +165,8 @@ resize() {
     kpartx -av $raw_imgfile
     sleep 2
     dmsetup ls
-    fdisk -l /dev/${loopdevice:0:5} || true
-    growpart /dev/${loopdevice:0:5} 1
+    fdisk -l /dev/${loopdevice:0:-2} || true
+    growpart /dev/${loopdevice:0:-2} 1
     dmsetup clear $loopdevice
     kpartx -dv $raw_imgfile || eliminate
 }
@@ -179,7 +179,7 @@ setup() {
     kpartx -av $raw_imgfile
     sleep 2
     dmsetup ls
-    fdisk -l /dev/${loopdevice:0:5} || true
+    fdisk -l /dev/${loopdevice:0:-2} || true
 
     if [ "xfs" = "$(blkid -o value -s TYPE /dev/mapper/$loopdevice)" ]; then
         mountopts="-o nouuid"