|
 |
4ebc84 |
From 1fc6b5a843dce740fd766c3a65ae378730fc9126 Mon Sep 17 00:00:00 2001
|
|
|
4ebc84 |
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com>
|
|
|
4ebc84 |
Date: Fri, 8 Feb 2019 11:44:41 +0100
|
|
|
4ebc84 |
Subject: [PATCH] v2v: fix path to source when copying files from guest tools
|
|
|
4ebc84 |
directory
|
|
|
4ebc84 |
MIME-Version: 1.0
|
|
|
4ebc84 |
Content-Type: text/plain; charset=UTF-8
|
|
|
4ebc84 |
Content-Transfer-Encoding: 8bit
|
|
|
4ebc84 |
|
|
|
4ebc84 |
The debug message was slightly changed too to better match the similar
|
|
|
4ebc84 |
message for ISO case. It refers to the root directory instead of the
|
|
|
4ebc84 |
specific subdirectory inside guest tools.
|
|
|
4ebc84 |
|
|
|
4ebc84 |
Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com>
|
|
|
4ebc84 |
(cherry picked from commit f4bda5571a36da42bdc800c10f2c85cf20bf5c85)
|
|
|
4ebc84 |
---
|
|
|
4ebc84 |
v2v/windows_virtio.ml | 7 ++++---
|
|
|
4ebc84 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
4ebc84 |
|
|
|
4ebc84 |
diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml
|
|
|
4ebc84 |
index f3302aed6..59b0bf493 100644
|
|
|
4ebc84 |
--- a/v2v/windows_virtio.ml
|
|
|
4ebc84 |
+++ b/v2v/windows_virtio.ml
|
|
|
4ebc84 |
@@ -315,10 +315,11 @@ and copy_drivers g inspect driverdir =
|
|
|
4ebc84 |
and copy_from_virtio_win g inspect srcdir destdir filter missing =
|
|
|
4ebc84 |
let ret = ref [] in
|
|
|
4ebc84 |
if is_directory virtio_win then (
|
|
|
4ebc84 |
- let dir = virtio_win // srcdir in
|
|
|
4ebc84 |
- debug "windows: copy_from_virtio_win: guest tools source directory %s" dir;
|
|
|
4ebc84 |
+ debug "windows: copy_from_virtio_win: guest tools source directory %s"
|
|
|
4ebc84 |
+ virtio_win;
|
|
|
4ebc84 |
|
|
|
4ebc84 |
- if not (is_directory srcdir) then missing ()
|
|
|
4ebc84 |
+ let dir = virtio_win // srcdir in
|
|
|
4ebc84 |
+ if not (is_directory dir) then missing ()
|
|
|
4ebc84 |
else (
|
|
|
4ebc84 |
let cmd = sprintf "cd %s && find -L -type f" (quote dir) in
|
|
|
4ebc84 |
let paths = external_command cmd in
|
|
|
4ebc84 |
--
|
|
|
4ebc84 |
2.21.0
|
|
|
4ebc84 |
|