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-103356
This commit is contained in:
Richard W.M. Jones 2025-07-15 10:17:34 +01:00
parent f834344bf3
commit 85e585ae6c
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,27 @@
From 656d7a430e17dc3f4d41f625c056527c576f4381 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 8f0ff87b..2ff9bcfa 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

@ -7,7 +7,7 @@
Name: virt-v2v
Epoch: 1
Version: 2.8.1
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Convert a virtual machine to run on KVM
License: GPL-2.0-or-later AND LGPL-2.0-or-later
@ -48,6 +48,7 @@ Patch0018: 0018-RHEL-tests-Remove-btrfs-test.patch
Patch0019: 0019-RHEL-Remove-block-driver-option.patch
Patch0020: 0020-RHEL-Remove-o-ovirt-o-ovirt-upload-and-o-vdsm-modes.patch
Patch0021: 0021-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
Patch0022: 0022-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
@ -338,7 +339,7 @@ done
%changelog
* Sun Jul 13 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.1-4
* Tue Jul 15 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.1-5
- Rebase to virt-v2v 2.8.1
related: RHEL-81735
- Fix virt-v2v -v --install dnf5 error