Skip to content

Commit 08887c0

Browse files
committed
Virtual_disk: fix virtio_scsi driver issue in image mode
Dracut command is used in guest to add the scsi driver. But in image mode it can't write to /boot/efi. Because actually this is not a necessary checkpoint in test scenario, so I think we can directly skip this step in case. Signed-off-by: meinaLi <[email protected]>
1 parent 23e29d6 commit 08887c0

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

libvirt/tests/src/virtual_disks/virtual_disks_multidisks.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
from virttest import data_dir
2222
from virttest import utils_selinux
2323
from virttest import utils_package
24+
from virttest import utils_sys
2425

2526
from virttest.utils_test import libvirt
2627
from virttest.utils_config import LibvirtQemuConfig
@@ -1095,8 +1096,10 @@ def check_info_in_libvird_log_file(matchedMsg=None):
10951096
guest_arch_name=arch)
10961097
if add_disk_driver:
10971098
# Ignore errors here
1098-
session.cmd("dracut --force --add-drivers '%s'"
1099-
% add_disk_driver, timeout=360)
1099+
image_mode = utils_sys.is_image_mode(session=session)
1100+
if not image_mode:
1101+
session.cmd("dracut --force --add-drivers '%s'"
1102+
% add_disk_driver, timeout=360)
11001103
# In terms of s390x, additional step is needed for normal guest
11011104
# boot, see https://bugzilla.redhat.com/show_bug.cgi?id=2214147
11021105
if arch == 's390x':

0 commit comments

Comments
 (0)