rpms/virt-v2v
6
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-18 10:55:19 +01:00
parent 185d27f4a4
commit b227bd25a3
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
0024-remove-timeout-before-installing-virtio-win-drivers.patch Normal file
View File

@ -0,0 +1,24 @@
From 74cbf6c5f6c65736a5b5e70aa8876564948645fa Mon Sep 17 00:00:00 2001
From: Vadim Rozenfeld <vrozenfe@redhat.com>
Date: Fri, 18 Jul 2025 19:31:34 +1000
Subject: [PATCH] remove timeout before installing virtio-win drivers
Signed-off-by: Vadim Rozenfeld <vrozenfe@redhat.com>
(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 2ff9bcfa..f416b3ad 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\

5
virt-v2v.spec
View File

@ -7,7 +7,7 @@
Name: virt-v2v Name: virt-v2v
Epoch: 1 Epoch: 1
Version: 2.8.1 Version: 2.8.1
Release: 6%{?dist} Release: 7%{?dist}
Summary: Convert a virtual machine to run on KVM Summary: Convert a virtual machine to run on KVM
License: GPL-2.0-or-later AND LGPL-2.0-or-later License: GPL-2.0-or-later AND LGPL-2.0-or-later
@ -50,6 +50,7 @@ Patch0020: 0020-RHEL-tests-Remove-btrfs-test.patch
Patch0021: 0021-RHEL-Remove-block-driver-option.patch Patch0021: 0021-RHEL-Remove-block-driver-option.patch
Patch0022: 0022-RHEL-Remove-o-ovirt-o-ovirt-upload-and-o-vdsm-modes.patch Patch0022: 0022-RHEL-Remove-o-ovirt-o-ovirt-upload-and-o-vdsm-modes.patch
Patch0023: 0023-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch Patch0023: 0023-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch
Patch0024: 0024-remove-timeout-before-installing-virtio-win-drivers.patch
%if !0%{?rhel} %if !0%{?rhel}
# libguestfs hasn't been built on i686 for a while since there is no # libguestfs hasn't been built on i686 for a while since there is no
@ -340,7 +341,7 @@ done
%changelog %changelog
* Wed Jul 16 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.1-6 * Wed Jul 16 2025 Richard W.M. Jones <rjones@redhat.com> - 1:2.8.1-7
- Rebase to virt-v2v 2.8.1 - Rebase to virt-v2v 2.8.1
related: RHEL-81735 related: RHEL-81735
- Fix virt-v2v -v --install dnf5 error - Fix virt-v2v -v --install dnf5 error