|
 |
0d20ef |
From 478a3efd62b41508405a9065919b0ae37cf63414 Mon Sep 17 00:00:00 2001
|
|
|
0d20ef |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
0d20ef |
Date: Thu, 23 Oct 2014 08:41:56 +0100
|
|
|
0d20ef |
Subject: [PATCH] RHEL 7: v2v: Disable unconfiguration of VMware drivers on
|
|
|
0d20ef |
Linux (RHBZ#1155610).
|
|
|
0d20ef |
|
|
|
0d20ef |
This is currently broken and breaks conversions. For details see:
|
|
|
0d20ef |
https://bugzilla.redhat.com/show_bug.cgi?id=1155610
|
|
|
0d20ef |
---
|
|
|
0d20ef |
v2v/convert_linux.ml | 4 +++-
|
|
|
0d20ef |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
0d20ef |
|
|
|
0d20ef |
diff --git a/v2v/convert_linux.ml b/v2v/convert_linux.ml
|
|
|
0d20ef |
index 709b4b9..67de2b1 100644
|
|
|
0d20ef |
--- a/v2v/convert_linux.ml
|
|
|
0d20ef |
+++ b/v2v/convert_linux.ml
|
|
|
0d20ef |
@@ -537,6 +537,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source =
|
|
|
0d20ef |
msg
|
|
|
0d20ef |
)
|
|
|
0d20ef |
|
|
|
0d20ef |
+(* Disabled in RHEL 7.1: see https://bugzilla.redhat.com/show_bug.cgi?id=1155610
|
|
|
0d20ef |
and unconfigure_vmware () =
|
|
|
0d20ef |
(* Look for any configured VMware yum repos and disable them. *)
|
|
|
0d20ef |
let repos =
|
|
|
0d20ef |
@@ -627,6 +628,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source =
|
|
|
0d20ef |
warning ~prog (f_"VMware tools was detected, but uninstallation failed. The error message was: %s (ignored)")
|
|
|
0d20ef |
msg
|
|
|
0d20ef |
)
|
|
|
0d20ef |
+*)
|
|
|
0d20ef |
|
|
|
0d20ef |
and unconfigure_citrix () =
|
|
|
0d20ef |
let pkgs =
|
|
|
0d20ef |
@@ -1417,7 +1419,7 @@ let rec convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source =
|
|
|
0d20ef |
|
|
|
0d20ef |
unconfigure_xen ();
|
|
|
0d20ef |
unconfigure_vbox ();
|
|
|
0d20ef |
- unconfigure_vmware ();
|
|
|
0d20ef |
+ (*unconfigure_vmware ();*)
|
|
|
0d20ef |
unconfigure_citrix ();
|
|
|
0d20ef |
unconfigure_efi ();
|
|
|
0d20ef |
unconfigure_kudzu ();
|
|
|
0d20ef |
--
|
|
|
0d20ef |
1.8.3.1
|
|
|
0d20ef |
|