diff --git a/0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch b/0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch new file mode 100644 index 0000000..65d461a --- /dev/null +++ b/0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch @@ -0,0 +1,45 @@ +From c952f310c902e438a8b0b5240a4b486b698bede8 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 5 Aug 2024 10:08:34 +0100 +Subject: [PATCH] docs: Add a note about removal of VMware Tools on Windows + +We use VMware's recommended method for removal, but we know from +experience that this rarely works. The alternate method being +proposed involves making very invasive changes to the Registry and +filesystem, which are inappropriate for virt-v2v to do and highly +risky. Therefore simply document this, with notes for the virt-v2v +user if they want to try the risky method. + +Fixes: https://issues.redhat.com/browse/RHEL-51169 +Thanks: Yan Vugenfirer +Reported-by: Ming Xie +--- + docs/virt-v2v.pod | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod +index dfe92d77..92941026 100644 +--- a/docs/virt-v2v.pod ++++ b/docs/virt-v2v.pod +@@ -1299,6 +1299,21 @@ B Take care not to interrupt the automatic driver installation + process when logging in to the guest for the first time, as this may + prevent the guest from subsequently booting correctly. + ++=head3 Removing VMware Tools from Windows guests ++ ++Virt-v2v attempts to remove VMware Tools. For Windows guests this is ++supposed to happen during the first boot after conversion. ++ ++We use VMware's recommended uninstallation method as that is the ++safest choice. However our experience has shown that this method ++usually fails. If so, VMware Tools must be removed by some other ++method. ++ ++One possible method is described here: ++L ++You should carefully check this script since it makes very invasive ++changes to the Windows Registry and filesystem. ++ + =head2 Free space for conversion + + =head3 Free space in the guest diff --git a/0005-Update-common-submodule.patch b/0005-Update-common-submodule.patch new file mode 100644 index 0000000..c2b6872 --- /dev/null +++ b/0005-Update-common-submodule.patch @@ -0,0 +1,25 @@ +From 7bc9b115baba6df2969451cd6907e2d7543ef22d Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 5 Aug 2024 10:18:31 +0100 +Subject: [PATCH] Update common submodule + +Richard W.M. Jones (1): + mlcustomize: Write qemu-ga log file name to log.txt +--- + common | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Submodule common 04116678..7b84a370: +diff --git a/common/mlcustomize/inject_virtio_win.ml b/common/mlcustomize/inject_virtio_win.ml +index 2981bff5..afec1e45 100644 +--- a/common/mlcustomize/inject_virtio_win.ml ++++ b/common/mlcustomize/inject_virtio_win.ml +@@ -606,6 +606,8 @@ and configure_qemu_ga t tempdir_win files = + add "# Run qemu-ga installers"; + List.iter ( + fun msi -> ++ add (sprintf "Write-Host \"Writing log to %s\\%s.log\"" ++ tempdir_win msi); + (* [`] is an escape char for quotes *) + add (sprintf "Start-Process -Wait -FilePath \"%s\\%s\" -ArgumentList \"/norestart\",\"/qn\",\"/l+*vx\",\"`\"%s\\%s.log`\"\"" + tempdir_win msi tempdir_win msi) diff --git a/0004-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch b/0006-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch similarity index 94% rename from 0004-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch rename to 0006-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch index 2f51c3a..330edae 100644 --- a/0004-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch +++ b/0006-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch @@ -1,4 +1,4 @@ -From a568f61299465179ff13b99e5710756f659d1dca Mon Sep 17 00:00:00 2001 +From 2199e82ff02b9bcaf3dac69aa937e00e13c0393b Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 28 Sep 2014 19:14:43 +0100 Subject: [PATCH] RHEL: v2v: Select correct qemu binary for -o qemu mode diff --git a/0005-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch b/0007-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch similarity index 97% rename from 0005-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch rename to 0007-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch index 7247354..4e75b10 100644 --- a/0005-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch +++ b/0007-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch @@ -1,4 +1,4 @@ -From e587c788aacc67b83931fc2fb4fddf402dd7f065 Mon Sep 17 00:00:00 2001 +From e60f9feaf0edb2074929136c8e43ac5936878f94 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Sep 2014 10:50:27 +0100 Subject: [PATCH] RHEL: v2v: Disable the --qemu-boot / -oo qemu-boot option @@ -44,7 +44,7 @@ index d2a1c270..0be37f5e 100644 =item B<-o null> diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index dfe92d77..0729571f 100644 +index 92941026..85ecd36c 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -146,11 +146,6 @@ Since F contains the path(s) to the guest disk diff --git a/0006-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch b/0008-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch similarity index 92% rename from 0006-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch rename to 0008-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch index edce216..5a4c206 100644 --- a/0006-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch +++ b/0008-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch @@ -1,4 +1,4 @@ -From 87fd400284565dfea49da03b158ced8efa1a4517 Mon Sep 17 00:00:00 2001 +From a62760d22ce7637b6f32d7cce43c422eea417ac0 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 24 Apr 2015 09:45:41 -0400 Subject: [PATCH] RHEL: Fix list of supported sound cards to match RHEL qemu diff --git a/0007-RHEL-Fixes-for-libguestfs-winsupport.patch b/0009-RHEL-Fixes-for-libguestfs-winsupport.patch similarity index 98% rename from 0007-RHEL-Fixes-for-libguestfs-winsupport.patch rename to 0009-RHEL-Fixes-for-libguestfs-winsupport.patch index 4a7f359..7771327 100644 --- a/0007-RHEL-Fixes-for-libguestfs-winsupport.patch +++ b/0009-RHEL-Fixes-for-libguestfs-winsupport.patch @@ -1,4 +1,4 @@ -From 54b614122415c9d52bf872f66561b74cd5139b42 Mon Sep 17 00:00:00 2001 +From 1a4d41c9ebd73f431f19dca6f4453f47e7a14b15 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Sun, 30 Aug 2015 03:21:57 -0400 Subject: [PATCH] RHEL: Fixes for libguestfs-winsupport. diff --git a/0008-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch b/0010-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch similarity index 93% rename from 0008-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch rename to 0010-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch index add90bc..83536ed 100644 --- a/0008-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch +++ b/0010-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch @@ -1,4 +1,4 @@ -From d7ff9e90054d4d19519d40c36415224918a91216 Mon Sep 17 00:00:00 2001 +From 686288d3c82666a460d907ede69897878103d932 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Mar 2017 14:21:37 +0100 Subject: [PATCH] RHEL: v2v: -i disk: force VNC as display (RHBZ#1372671) diff --git a/0009-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch b/0011-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch similarity index 91% rename from 0009-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch rename to 0011-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch index 4a87dc1..db74c43 100644 --- a/0009-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch +++ b/0011-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch @@ -1,4 +1,4 @@ -From 0adb9255ebd89e127336e942d088099b25b80005 Mon Sep 17 00:00:00 2001 +From f0cb8de238a4deaf10262aa297f70242e865928f Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Wed, 8 Mar 2017 11:03:40 +0100 Subject: [PATCH] RHEL: v2v: do not mention SUSE Xen hosts (RHBZ#1430203) diff --git a/0010-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch b/0012-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch similarity index 97% rename from 0010-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch rename to 0012-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch index 4f433e3..f9ac258 100644 --- a/0010-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch +++ b/0012-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch @@ -1,4 +1,4 @@ -From 397dbf5e9ebc22e31736663fa97b18bd82f283ba Mon Sep 17 00:00:00 2001 +From 7b18de8a3b687a0754c5f836666a4ed36a8b118a Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 26 Mar 2019 09:42:25 +0100 Subject: [PATCH] RHEL: point to KB for supported v2v hypervisors/guests diff --git a/0011-RHEL-Disable-o-glance.patch b/0013-RHEL-Disable-o-glance.patch similarity index 97% rename from 0011-RHEL-Disable-o-glance.patch rename to 0013-RHEL-Disable-o-glance.patch index 221f4e5..22dabff 100644 --- a/0011-RHEL-Disable-o-glance.patch +++ b/0013-RHEL-Disable-o-glance.patch @@ -1,4 +1,4 @@ -From d9386ae9de3ab7f66d61958cdf8f5f29ad801a91 Mon Sep 17 00:00:00 2001 +From fc6cb9eb79dc237836820e672c1b5dbcd3526b73 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Wed, 30 Jun 2021 11:15:52 +0100 Subject: [PATCH] RHEL: Disable -o glance @@ -98,7 +98,7 @@ index cd4862b1..54cd276e 100644 =head1 AUTHOR diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index 0729571f..d428a326 100644 +index 85ecd36c..99ad371e 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -435,14 +435,6 @@ See L below. @@ -128,7 +128,7 @@ index 0729571f..d428a326 100644 =item I<-o local> =item I<-o qemu> -@@ -1381,13 +1368,6 @@ See also L. +@@ -1396,13 +1383,6 @@ See also L. Because of how Cinder volumes are presented as F block devices, using I<-o openstack> normally requires that virt-v2v is run as root. diff --git a/0012-RHEL-Remove-the-in-place-option.patch b/0014-RHEL-Remove-the-in-place-option.patch similarity index 95% rename from 0012-RHEL-Remove-the-in-place-option.patch rename to 0014-RHEL-Remove-the-in-place-option.patch index 5eb4f1e..d88d2a9 100644 --- a/0012-RHEL-Remove-the-in-place-option.patch +++ b/0014-RHEL-Remove-the-in-place-option.patch @@ -1,4 +1,4 @@ -From 5fc3541d455a6a47643ef028597d21c9cfcf7b62 Mon Sep 17 00:00:00 2001 +From 0973cff2592426726f00112581f6e18eeca02607 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 2 Dec 2021 11:56:05 +0000 Subject: [PATCH] RHEL: Remove the --in-place option @@ -12,7 +12,7 @@ wish to support in RHEL. 3 files changed, 17 deletions(-) diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index d428a326..d206e4fa 100644 +index 99ad371e..39b27516 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -24,9 +24,6 @@ virtualize those machines (physical to virtual, or p2v). @@ -36,7 +36,7 @@ index d428a326..d206e4fa 100644 =head2 Other virt-v2v topics L — Supported hypervisors, virtualization -@@ -1649,7 +1642,6 @@ L, L, diff --git a/0013-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch b/0015-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch similarity index 96% rename from 0013-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch rename to 0015-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch index ea15616..03dda83 100644 --- a/0013-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch +++ b/0015-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch @@ -1,4 +1,4 @@ -From 3d01b1301476ddb77c7327ee86f2c8054c16226b Mon Sep 17 00:00:00 2001 +From af65e12a183ff052755e3026dac18a6b93264cde Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 Jul 2022 11:56:54 +0100 Subject: [PATCH] RHEL 9: -oo compressed: Remove nbdcopy version check and test diff --git a/0014-RHEL-9-tests-Remove-btrfs-test.patch b/0016-RHEL-9-tests-Remove-btrfs-test.patch similarity index 91% rename from 0014-RHEL-9-tests-Remove-btrfs-test.patch rename to 0016-RHEL-9-tests-Remove-btrfs-test.patch index be9dd40..78284d1 100644 --- a/0014-RHEL-9-tests-Remove-btrfs-test.patch +++ b/0016-RHEL-9-tests-Remove-btrfs-test.patch @@ -1,4 +1,4 @@ -From 1b2973841cfad867380f124b22ee00255cf2f94f Mon Sep 17 00:00:00 2001 +From 022d8a4f9f89c8c47251a446ca03aaefcea3bb30 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 5 Jul 2022 11:58:09 +0100 Subject: [PATCH] RHEL 9: tests: Remove btrfs test diff --git a/0015-RHEL-9-Remove-block-driver-option.patch b/0017-RHEL-9-Remove-block-driver-option.patch similarity index 98% rename from 0015-RHEL-9-Remove-block-driver-option.patch rename to 0017-RHEL-9-Remove-block-driver-option.patch index b29bce1..b2eb7a1 100644 --- a/0015-RHEL-9-Remove-block-driver-option.patch +++ b/0017-RHEL-9-Remove-block-driver-option.patch @@ -1,4 +1,4 @@ -From d3dfe4d958a5454498ca87ecf98ac42c0533d603 Mon Sep 17 00:00:00 2001 +From 7aa84cc24a69059f4137868a8392253e3b619c15 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 28 Apr 2023 12:28:19 +0100 Subject: [PATCH] RHEL 9: Remove --block-driver option @@ -37,7 +37,7 @@ index ce57e229..6e1c5363 100644 =item B<--colours> diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod -index d206e4fa..39deddc7 100644 +index 39b27516..2078e0c0 100644 --- a/docs/virt-v2v.pod +++ b/docs/virt-v2v.pod @@ -197,16 +197,6 @@ The options are silently ignored for other input methods. diff --git a/0016-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch b/0018-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch similarity index 93% rename from 0016-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch rename to 0018-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch index 3260626..a2c9a10 100644 --- a/0016-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch +++ b/0018-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch @@ -1,4 +1,4 @@ -From 5ffec2063cd7075e70400214e6a5b99e6e747b3b Mon Sep 17 00:00:00 2001 +From 27c337d6425ba7aa2927a59655d668c36c4ee83f Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 9 Jul 2024 11:30:09 +0100 Subject: [PATCH] RHEL: Add warning about virt-v2v-in-place not being supported diff --git a/virt-v2v.spec b/virt-v2v.spec index 07e4711..82767d2 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -8,7 +8,7 @@ Name: virt-v2v Epoch: 1 Version: 2.5.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -31,19 +31,21 @@ Source3: copy-patches.sh Patch0001: 0001-docs-Note-that-mac-len-field-is-now-optional.patch Patch0002: 0002-convert-More-robust-qemu-ga-installation-change-path.patch Patch0003: 0003-common-mlcustomize-Inject-qemu-ga-blnsvr-into-firstb.patch -Patch0004: 0004-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch -Patch0005: 0005-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch -Patch0006: 0006-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch -Patch0007: 0007-RHEL-Fixes-for-libguestfs-winsupport.patch -Patch0008: 0008-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch -Patch0009: 0009-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch -Patch0010: 0010-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch -Patch0011: 0011-RHEL-Disable-o-glance.patch -Patch0012: 0012-RHEL-Remove-the-in-place-option.patch -Patch0013: 0013-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch -Patch0014: 0014-RHEL-9-tests-Remove-btrfs-test.patch -Patch0015: 0015-RHEL-9-Remove-block-driver-option.patch -Patch0016: 0016-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch +Patch0004: 0004-docs-Add-a-note-about-removal-of-VMware-Tools-on-Win.patch +Patch0005: 0005-Update-common-submodule.patch +Patch0006: 0006-RHEL-v2v-Select-correct-qemu-binary-for-o-qemu-mode-.patch +Patch0007: 0007-RHEL-v2v-Disable-the-qemu-boot-oo-qemu-boot-option-R.patch +Patch0008: 0008-RHEL-Fix-list-of-supported-sound-cards-to-match-RHEL.patch +Patch0009: 0009-RHEL-Fixes-for-libguestfs-winsupport.patch +Patch0010: 0010-RHEL-v2v-i-disk-force-VNC-as-display-RHBZ-1372671.patch +Patch0011: 0011-RHEL-v2v-do-not-mention-SUSE-Xen-hosts-RHBZ-1430203.patch +Patch0012: 0012-RHEL-point-to-KB-for-supported-v2v-hypervisors-guest.patch +Patch0013: 0013-RHEL-Disable-o-glance.patch +Patch0014: 0014-RHEL-Remove-the-in-place-option.patch +Patch0015: 0015-RHEL-9-oo-compressed-Remove-nbdcopy-version-check-an.patch +Patch0016: 0016-RHEL-9-tests-Remove-btrfs-test.patch +Patch0017: 0017-RHEL-9-Remove-block-driver-option.patch +Patch0018: 0018-RHEL-Add-warning-about-virt-v2v-in-place-not-being-s.patch %if !0%{?rhel} # libguestfs hasn't been built on i686 for a while since there is no @@ -347,6 +349,10 @@ make -C tests TESTS=test-v2v-fedora-luks-on-lvm-conversion.sh check %changelog +* Mon Aug 05 2024 Richard W.M. Jones - 1:2.5.6-2 +- Document uninstallation of VMware Tools on Windows + resolves: RHEL-51169 + * Thu Aug 01 2024 Richard W.M. Jones - 1:2.5.6-1 - Further fixes for QEMU Guest Agent resolves: RHEL-49761