Blame SOURCES/0122-v2v-allow-configurable-location-for-virtio-drivers.patch

ffd6ed
From b89ad1b8ac7f31511254c383573c812ff93abd91 Mon Sep 17 00:00:00 2001
ffd6ed
From: Roman Kagan <rkagan@parallels.com>
ffd6ed
Date: Tue, 31 Mar 2015 16:26:38 +0300
ffd6ed
Subject: [PATCH] v2v: allow configurable location for virtio drivers
ffd6ed
ffd6ed
Make the location of the Windows virtio drivers overridable with the
ffd6ed
environment variable VIRTIO_WIN_DIR, in the same vein as is done for
ffd6ed
virt-tools.
ffd6ed
ffd6ed
Signed-off-by: Roman Kagan <rkagan@parallels.com>
ffd6ed
(cherry picked from commit b8cb5c0d69e7ab8cd8598c0c49f0d65a1366cd62)
ffd6ed
---
ffd6ed
 v2v/convert_windows.ml |  4 +++-
ffd6ed
 v2v/virt-v2v.pod       | 10 ++++++++--
ffd6ed
 2 files changed, 11 insertions(+), 3 deletions(-)
ffd6ed
ffd6ed
diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml
ffd6ed
index 1605a91..1e77369 100644
ffd6ed
--- a/v2v/convert_windows.ml
ffd6ed
+++ b/v2v/convert_windows.ml
ffd6ed
@@ -47,7 +47,9 @@ let convert ~verbose ~keep_serial_console (g : G.guestfs) inspect source =
ffd6ed
     try Sys.getenv "VIRT_TOOLS_DATA_DIR"
ffd6ed
     with Not_found -> Config.datadir // "virt-tools" in
ffd6ed
 
ffd6ed
-  let virtio_win_dir = "/usr/share/virtio-win" in
ffd6ed
+  let virtio_win_dir =
ffd6ed
+    try Sys.getenv "VIRTIO_WIN_DIR"
ffd6ed
+    with Not_found -> Config.datadir // "virtio-win" in
ffd6ed
 
ffd6ed
   (* Check if RHEV-APT exists.  This is optional. *)
ffd6ed
   let rhev_apt_exe = virt_tools_data_dir // "rhev-apt.exe" in
ffd6ed
diff --git a/v2v/virt-v2v.pod b/v2v/virt-v2v.pod
ffd6ed
index 91e8f3e..5ee3bd8 100644
ffd6ed
--- a/v2v/virt-v2v.pod
ffd6ed
+++ b/v2v/virt-v2v.pod
ffd6ed
@@ -620,8 +620,9 @@ below.
ffd6ed
  
ffd6ed
  OpenSUSE 10    kernel >= 2.6.25.5-1.1
ffd6ed
 
ffd6ed
- Windows        Drivers are installed from /usr/share/virtio-win
ffd6ed
-                if present
ffd6ed
+ Windows        Drivers are installed from the directory pointed to by
ffd6ed
+                "VIRTIO_WIN_DIR" environment variable
ffd6ed
+                (/usr/share/virtio-win by default) if present
ffd6ed
 
ffd6ed
 =head1 RHEL 4
ffd6ed
 
ffd6ed
@@ -1440,6 +1441,11 @@ not distributed with virt-v2v.
ffd6ed
 
ffd6ed
 =back
ffd6ed
 
ffd6ed
+=item C<VIRTIO_WIN_DIR>
ffd6ed
+
ffd6ed
+This is where VirtIO drivers for Windows are searched for
ffd6ed
+(F</usr/share/virtio-win> if unset).  See L<ENABLING VIRTIO>.
ffd6ed
+
ffd6ed
 =back
ffd6ed
 
ffd6ed
 For other environment variables, see L<guestfs(3)/ENVIRONMENT VARIABLES>.
ffd6ed
-- 
ffd6ed
1.8.3.1
ffd6ed