|
 |
e76f14 |
From 5af7ba1b2e7e833fc0cb1f0cbb6cbde0f4bb89fe 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
|
|
|
e76f14 |
index 17fda7c..bdbd06b 100644
|
|
|
0d20ef |
--- a/v2v/convert_linux.ml
|
|
|
0d20ef |
+++ b/v2v/convert_linux.ml
|
|
|
e76f14 |
@@ -540,6 +540,7 @@ let rec convert ~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 =
|
|
|
e76f14 |
@@ -630,6 +631,7 @@ let rec convert ~keep_serial_console (g : G.guestfs) inspect source =
|
|
|
e76f14 |
warning (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 =
|
|
|
e76f14 |
@@ -1385,7 +1387,7 @@ let rec convert ~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_kudzu ();
|
|
|
e76f14 |
|
|
|
0d20ef |
--
|
|
|
aa0300 |
2.7.4
|
|
|
0d20ef |
|