From 893336672393500172bf750d05980a94f489b2f6 Mon Sep 17 00:00:00 2001

From: Nir Soffer <nirsof@gmail.com>

Date: Mon, 2 Sep 2019 17:45:13 +0100

Subject: [PATCH] v2v: Set DISKTYPE=2 in RHV and VDSM meta files

 (RHBZ#1746699).

Added in virt-p2v commit:

  commit e83b6f50af34ce650063ecc520bfabab400e8e73

  Author: Matthew Booth <mbooth@redhat.com>

  Date:   Fri Mar 26 09:40:20 2010 +0000

    Add export to RHEV

    Allow guests to be written to a RHEV NFS export storage domain.

    Add 'rhev' output method and -osd command-line option.

    Example command line:

     virt-v2v -f virt-v2v.conf -ic 'esx://yellow.rhev.marston/' \

              -o rhev -osd blue:/export/export RHEL3-32

    This will connect to an ESX server and write the guest 'RHEL3-32' to

    blue:/export/export, which is a pre-initialised RHEV export storage domain.

(cherry picked from commit fcfdbc9420b07e3003df38481afb9ccd22045e1a)

---

 v2v/create_ovf.ml | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2v/create_ovf.ml b/v2v/create_ovf.ml

index 91ff5198d..9aad5dd15 100644

--- a/v2v/create_ovf.ml

+++ b/v2v/create_ovf.ml

@@ -501,7 +501,7 @@ let create_meta_files output_alloc sd_uuid image_uuids overlays =

       bpf "CTIME=%.0f\n" time;

       bpf "MTIME=%.0f\n" time;

       bpf "IMAGE=%s\n" image_uuid;

-      bpf "DISKTYPE=1\n";

+      bpf "DISKTYPE=2\n";

       bpf "PUUID=00000000-0000-0000-0000-000000000000\n";

       bpf "LEGALITY=LEGAL\n";

       bpf "POOL_UUID=\n";

-- 

2.21.0