diff --git a/0022-docs-Document-io-vddk-file-in-the-main-options-listi.patch b/0022-docs-Document-io-vddk-file-in-the-main-options-listi.patch new file mode 100644 index 0000000..5a202da --- /dev/null +++ b/0022-docs-Document-io-vddk-file-in-the-main-options-listi.patch @@ -0,0 +1,25 @@ +From 2c84c559fe410abb3fa9095e994660798800e75a Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Thu, 15 May 2025 16:41:30 +0100 +Subject: [PATCH] docs: Document -io vddk-file in the main options listing + +Reported-by: Ming Xie +Fixes: commit 5328142e6a9faae1db99c646991d27badc6efe91 +(cherry picked from commit 3a54eabde33fe753ebd864785de8a2fe54c2e1a2) +--- + docs/virt-v2v.pod | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/docs/virt-v2v.pod b/docs/virt-v2v.pod +index c6c222c4..c6a12086 100644 +--- a/docs/virt-v2v.pod ++++ b/docs/virt-v2v.pod +@@ -308,6 +308,8 @@ See L for details. + + =item B<-io vddk-cookie=>COOKIE + ++=item B<-io vddk-file=>FILE ++ + =item B<-io vddk-nfchostport=>PORT + + =item B<-io vddk-port=>PORT diff --git a/virt-v2v.spec b/virt-v2v.spec index 80f38c9..546adcc 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -7,7 +7,7 @@ Name: virt-v2v Epoch: 1 Version: 2.7.15 -Release: 2%{?dist} +Release: 3%{?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-docs-Document-io-vddk-file-in-the-main-options-listi.patch %if !0%{?rhel} # libguestfs hasn't been built on i686 for a while since there is no @@ -338,7 +339,7 @@ done %changelog -* Wed May 14 2025 Richard W.M. Jones - 1:2.7.15-2 +* Fri May 16 2025 Richard W.M. Jones - 1:2.7.15-3 - Rebase to virt-v2v 2.7.15 related: RHEL-81735 - Fix virt-v2v -v --install dnf5 error