Skip to content

Commit e6b2865

Browse files
Merge pull request #4048 from vanhalenar/osinfo
USHIFT-4349: Fixed --osinfo=generic warning
2 parents 6a8309d + 79bfe2f commit e6b2865

File tree

1 file changed

+19
-1
lines changed

1 file changed

+19
-1
lines changed

test/bin/scenario.sh

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,13 +533,31 @@ launch_vm() {
533533
vm_extra_args="fips=${fips_mode}"
534534
vm_initrd_inject=""
535535

536+
local osname
537+
538+
case "${boot_blueprint}" in
539+
rhel*9*4*)
540+
osname="rhel9.4"
541+
;;
542+
centos9*)
543+
osname="centos-stream9"
544+
;;
545+
*)
546+
record_junit "${vmname}" "osname-parse" "FAILED"
547+
exit 1
548+
;;
549+
esac
550+
551+
record_junit "${vmname}" "osname-parse" "OK"
552+
553+
536554
# Add support of bootc image directory sharing with virtual machines
537555
if [ "${bootc_mode}" -ne 0 ] ; then
538556
# The ISO files generated by bootc-image-builder is not recognized by virt-install.
539557
# Work around the problem by specifying kernel and initrd paths.
540558
if [[ "${boot_blueprint}.iso" == *-bootc.iso ]] ; then
541559
vm_loc_args+=",kernel=images/pxeboot/vmlinuz,initrd=images/pxeboot/initrd.img"
542-
vm_loc_args+=" --osinfo detect=on"
560+
vm_loc_args+=" --osinfo name=${osname}"
543561
fi
544562
fi
545563

0 commit comments

Comments
 (0)