|
 |
151578 |
From f49162600c5ed54341ebeba9bc773fefc6b8153d Mon Sep 17 00:00:00 2001
|
|
|
151578 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
151578 |
Date: Tue, 7 Nov 2017 10:07:03 +0000
|
|
|
151578 |
Subject: [PATCH] v2v: vddk: Update minimum version of nbdkit to 1.1.16.
|
|
|
151578 |
MIME-Version: 1.0
|
|
|
151578 |
Content-Type: text/plain; charset=UTF-8
|
|
|
151578 |
Content-Transfer-Encoding: 8bit
|
|
|
151578 |
|
|
|
151578 |
While 1.1.14 will technically still work, 1.1.16 adds the
|
|
|
151578 |
‘selinux=yes|no’ flag to ‘--dump-config’ output. It's also the more
|
|
|
151578 |
widely available and tested version at the time of writing.
|
|
|
151578 |
|
|
|
151578 |
Thanks: Ming Xie.
|
|
|
151578 |
(cherry picked from commit 415e9d82e901647438f68e4748720d88153778aa)
|
|
|
151578 |
---
|
|
|
151578 |
v2v/input_libvirt_vddk.ml | 5 +++--
|
|
|
151578 |
v2v/virt-v2v.pod | 2 +-
|
|
|
151578 |
2 files changed, 4 insertions(+), 3 deletions(-)
|
|
|
151578 |
|
|
|
151578 |
diff --git a/v2v/input_libvirt_vddk.ml b/v2v/input_libvirt_vddk.ml
|
|
|
151578 |
index 33b34bd2e..d1f2ae360 100644
|
|
|
151578 |
--- a/v2v/input_libvirt_vddk.ml
|
|
|
151578 |
+++ b/v2v/input_libvirt_vddk.ml
|
|
|
151578 |
@@ -61,13 +61,14 @@ class input_libvirt_vddk vddk_options password libvirt_uri parsed_uri guest =
|
|
|
151578 |
|
|
|
151578 |
(* Check it's a new enough version. The latest features we
|
|
|
151578 |
* require are ‘--exit-with-parent’ and ‘--selinux-label’, both
|
|
|
151578 |
- * added in 1.1.14.
|
|
|
151578 |
+ * added in 1.1.14. (We use 1.1.16 as the minimum here because
|
|
|
151578 |
+ * it also adds the selinux=yes|no flag in --dump-config).
|
|
|
151578 |
*)
|
|
|
151578 |
let lines = external_command "nbdkit --help" in
|
|
|
151578 |
let lines = String.concat " " lines in
|
|
|
151578 |
if String.find lines "exit-with-parent" == -1 ||
|
|
|
151578 |
String.find lines "selinux-label" == -1 then
|
|
|
151578 |
- error (f_"nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.14")
|
|
|
151578 |
+ error (f_"nbdkit is not new enough, you need to upgrade to nbdkit ≥ 1.1.16")
|
|
|
151578 |
in
|
|
|
151578 |
|
|
|
151578 |
(* Check that the VDDK plugin is installed and working *)
|
|
|
151578 |
diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
|
|
|
151578 |
index 4f7ea8da6..48a20cccc 100644
|
|
|
151578 |
--- a/v2v/virt-v2v.pod
|
|
|
151578 |
+++ b/v2v/virt-v2v.pod
|
|
|
151578 |
@@ -1305,7 +1305,7 @@ library is permitted by the license.
|
|
|
151578 |
=item 2.
|
|
|
151578 |
|
|
|
151578 |
You must also compile nbdkit, enabling the VDDK plugin. At least
|
|
|
151578 |
-nbdkit E<ge> 1.1.14 is required, but it is usually best to compile
|
|
|
151578 |
+nbdkit E<ge> 1.1.16 is required, but it is usually best to compile
|
|
|
151578 |
from the git tree.
|
|
|
151578 |
|
|
|
151578 |
=over 4
|
|
|
151578 |
--
|
|
|
151578 |
2.14.3
|
|
|
151578 |
|