From b4e766d25dfb06c98ad4b5335d152f06695d53ec Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Fri, 16 May 2025 09:41:35 +0100 Subject: [PATCH] Turn live domain error into a warning resolves: RHEL-88543 This commit adds a little more documentation. --- ...-vddk-file-in-the-main-options-listi.patch | 25 +++++++++++++++++++ virt-v2v.spec | 5 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 0055-docs-Document-io-vddk-file-in-the-main-options-listi.patch diff --git a/0055-docs-Document-io-vddk-file-in-the-main-options-listi.patch b/0055-docs-Document-io-vddk-file-in-the-main-options-listi.patch new file mode 100644 index 0000000..9cc0b83 --- /dev/null +++ b/0055-docs-Document-io-vddk-file-in-the-main-options-listi.patch @@ -0,0 +1,25 @@ +From ca1952901efe18f8ebdbe1aecd54cd8d86d2c890 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 b946758c..4495e53d 100644 +--- a/docs/virt-v2v.pod ++++ b/docs/virt-v2v.pod +@@ -324,6 +324,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 ef8a5b7..c485e47 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -8,7 +8,7 @@ Name: virt-v2v Epoch: 1 Version: 2.7.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Convert a virtual machine to run on KVM License: GPL-2.0-or-later AND LGPL-2.0-or-later @@ -82,6 +82,7 @@ Patch0051: 0051-docs-Rearrange-root-titles.patch Patch0052: 0052-docs-Clarify-root-first-documentation.patch Patch0053: 0053-docs-Remove-old-paragraph-about-a-bug-in-Grub.patch Patch0054: 0054-Add-new-virt-v2v-open-tool.patch +Patch0055: 0055-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 @@ -385,7 +386,7 @@ make -C tests TESTS=test-fedora-luks-on-lvm-conversion.sh check %changelog -* Wed May 07 2025 Richard W.M. Jones - 1:2.7.1-11 +* Fri May 16 2025 Richard W.M. Jones - 1:2.7.1-12 - mlcustomize: Remove dnf --verbose option resolves: RHEL-83289 - Print blkhash of converted image in virt-v2v debugging output