rpms/virt-v2v
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix installation of drivers on firstboot with pending reboots

Browse Source 
resolves: RHEL-100682
This commit is contained in:
Richard W.M. Jones 2025-07-15 10:17:21 +01:00
parent 27e99401af
commit 21ed4105a7
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0058-Ignore-ERROR_NO_MORE_ITEMS-status-from-PnPUtil.patch Normal file
View File

@ -0,0 +1,27 @@
From c744f4b588ae2db333c7975d20d9ccb281d07f65 Mon Sep 17 00:00:00 2001
From: Vadim Rozenfeld <vrozenfe@redhat.com>
Date: Tue, 15 Jul 2025 18:35:16 +1000
Subject: [PATCH] Ignore ERROR_NO_MORE_ITEMS status from PnPUtil.
This status indicates the target device already has a
better or newer driver installed.
Signed-off-by: Vadim Rozenfeld <vrozenfe@redhat.com>
(cherry picked from commit e445c45d9c2b0e5411730b3e737e067e03d6316d)
---
convert/convert_windows.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml
index a9ec276a..9b86b9a1 100644
--- a/convert/convert_windows.ml
+++ b/convert/convert_windows.ml
@@ -431,7 +431,7 @@ let convert (g : G.guestfs) source inspect i_firmware
for %%f in (\"%inf_dir%*.inf\") do (\n\
echo Installing: %%~nxf.\n\
%systemroot%\\Sysnative\\PnPutil -i -a \"%%f\"\n\
- if !errorlevel! NEQ 0 (\n\
+ if !errorlevel! neq 0 if !errorlevel! neq 259 (\n\
echo Failed to install %%~nxf.\n\
exit /b 249\n\
) else (\n\

5
virt-v2v.spec
View File

@ -8,7 +8,7 @@
Name: virt-v2v
Epoch: 1
Version: 2.7.1
Release: 14%{?dist}
Release: 15%{?dist}
Summary: Convert a virtual machine to run on KVM
License: GPL-2.0-or-later AND LGPL-2.0-or-later
@ -85,6 +85,7 @@ Patch0054: 0054-Add-new-virt-v2v-open-tool.patch
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
%if !0%{?rhel}
# libguestfs hasn't been built on i686 for a while since there is no
@ -388,7 +389,7 @@ make -C tests TESTS=test-fedora-luks-on-lvm-conversion.sh check
%changelog
* Sun Jul 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.1-14
* Tue Jul 15 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.7.1-15
- mlcustomize: Remove dnf --verbose option
resolves: RHEL-83289
- Print blkhash of converted image in virt-v2v debugging output