diff mbox series

[v4,8/8] start_vm: update image types checking

Message ID 20220428060615.986332-9-adriaan.schmidt@siemens.com
State Accepted, archived
Headers show
Series imagetypes | expand

Commit Message

Schmidt, Adriaan April 27, 2022, 10:06 p.m. UTC 
From: Anton Mikanovich <amikan@ilbers.de>

Image types checking in start_vm should be aligned with code updates.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 scripts/start_vm      | 8 ++++----
 testsuite/start_vm.py | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/scripts/start_vm b/scripts/start_vm
index c114d864..8876e538 100755
--- a/scripts/start_vm
+++ b/scripts/start_vm
@@ -113,8 +113,8 @@  eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "\(^IMAGE_FSTYPES=
 # Take first image type for VM if there are several defined
 IMAGE_FSTYPES=$(echo "$IMAGE_FSTYPES" | awk '{print $1}')
 case "$IMAGE_FSTYPES" in
-    ext4-img)
-    readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4.img
+    ext4)
+    readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4
 
     eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=")
     eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=")
@@ -130,8 +130,8 @@  case "$IMAGE_FSTYPES" in
 	-initrd $QINITRD"
     KARGS="console=$MACHINE_SERIAL root=/dev/$QEMU_ROOTFS_DEV rw $QEMU_KARGS"
     ;;
-    wic-img)
-    readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.wic.img
+    wic)
+    readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.wic
     EXTRA_ARGS="$EXTRA_ARGS -snapshot"
     ;;
     *)
diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py
index 708520f7..f761a8bd 100755
--- a/testsuite/start_vm.py
+++ b/testsuite/start_vm.py
@@ -31,8 +31,8 @@  def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False):
     image_type = get_bitbake_var(bb_output, 'IMAGE_FSTYPES').split()[0]
     deploy_dir_image = get_bitbake_var(bb_output, 'DEPLOY_DIR_IMAGE')
     base = 'ubuntu' if distro in ['focal', 'bionic'] else 'debian'
-    if image_type == 'ext4-img':
-        rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.ext4.img'
+    if image_type == 'ext4':
+        rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.ext4'
         kernel_image = deploy_dir_image + '/' + get_bitbake_var(bb_output, 'KERNEL_IMAGE')
         initrd_image = get_bitbake_var(bb_output, 'INITRD_IMAGE')
 
@@ -47,8 +47,8 @@  def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False):
 
         extra_args = ['-kernel', kernel_image, '-initrd', initrd_image]
         extra_args.extend(kargs)
-    elif image_type == 'wic-img':
-        rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.wic.img'
+    elif image_type == 'wic':
+        rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.wic'
         extra_args = ['-snapshot']
     else:
         raise ValueError('Invalid image type: ' + str(image_type))