diff --git a/SOURCES/0058-Ignore-ERROR_NO_MORE_ITEMS-status-from-PnPUtil.patch b/SOURCES/0058-Ignore-ERROR_NO_MORE_ITEMS-status-from-PnPUtil.patch index 53a5e65..b490b27 100644 --- a/SOURCES/0058-Ignore-ERROR_NO_MORE_ITEMS-status-from-PnPUtil.patch +++ b/SOURCES/0058-Ignore-ERROR_NO_MORE_ITEMS-status-from-PnPUtil.patch @@ -1,4 +1,4 @@ -From c744f4b588ae2db333c7975d20d9ccb281d07f65 Mon Sep 17 00:00:00 2001 +From 7c27641fc6d0ff1dfa8fe50b1a1ff9532d3c55ab Mon Sep 17 00:00:00 2001 From: Vadim Rozenfeld Date: Tue, 15 Jul 2025 18:35:16 +1000 Subject: [PATCH] Ignore ERROR_NO_MORE_ITEMS status from PnPUtil. @@ -7,7 +7,7 @@ This status indicates the target device already has a better or newer driver installed. Signed-off-by: Vadim Rozenfeld -(cherry picked from commit e445c45d9c2b0e5411730b3e737e067e03d6316d) +(cherry picked from commit 523aff28975532a4fe715193c28c2ede21741392) --- convert/convert_windows.ml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SOURCES/0059-remove-timeout-before-installing-virtio-win-drivers.patch b/SOURCES/0059-remove-timeout-before-installing-virtio-win-drivers.patch new file mode 100644 index 0000000..9307049 --- /dev/null +++ b/SOURCES/0059-remove-timeout-before-installing-virtio-win-drivers.patch @@ -0,0 +1,24 @@ +From 6c75a47977f16ed3ce533cd04f29ef2c30a3f2c1 Mon Sep 17 00:00:00 2001 +From: Vadim Rozenfeld +Date: Fri, 18 Jul 2025 19:31:34 +1000 +Subject: [PATCH] remove timeout before installing virtio-win drivers + +Signed-off-by: Vadim Rozenfeld +(cherry picked from commit 07192e2bf5e73dd4d3d7d3c1faa940c7a67e2d72) +--- + convert/convert_windows.ml | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml +index 9b86b9a1..d5a57d6e 100644 +--- a/convert/convert_windows.ml ++++ b/convert/convert_windows.ml +@@ -401,8 +401,6 @@ let convert (g : G.guestfs) source inspect i_firmware + echo Installing drivers from %inf_dir%\n\ + set REBOOT_PENDING=0\n\ + \n\ +- timeout /t 10 /nobreak\n\ +- \n\ + reg query \"HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\WindowsUpdate\\Auto Update\\RebootRequired\"\n\ + if %errorlevel%==0 (\n\ + echo Windows Update: Reboot required.\n\ diff --git a/SPECS/virt-v2v.spec b/SPECS/virt-v2v.spec index 6ec8e11..803bea7 100644 --- a/SPECS/virt-v2v.spec +++ b/SPECS/virt-v2v.spec @@ -8,7 +8,7 @@ Name: virt-v2v Epoch: 1 Version: 2.7.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -86,6 +86,7 @@ Patch0055: 0055-docs-Document-io-vddk-file-in-the-main-options-listi.patch Patch0056: 0056-vddk-Remove-io-vddk-noextents-option.patch Patch0057: 0057-Modify-configure_pnputil_install-script-to-check.patch Patch0058: 0058-Ignore-ERROR_NO_MORE_ITEMS-status-from-PnPUtil.patch +Patch0059: 0059-remove-timeout-before-installing-virtio-win-drivers.patch %if !0%{?rhel} # libguestfs hasn't been built on i686 for a while since there is no @@ -389,7 +390,7 @@ make -C tests TESTS=test-fedora-luks-on-lvm-conversion.sh check %changelog -* Tue Jul 15 2025 Richard W.M. Jones - 1:2.7.1-15 +* Fri Jul 18 2025 Richard W.M. Jones - 1:2.7.1-16 - mlcustomize: Remove dnf --verbose option resolves: RHEL-83289 - Print blkhash of converted image in virt-v2v debugging output