[Libguestfs] [PATCH v5 2/3] v2v: fix path construction in Windows_virtio.copy_files()

Tomáš Golembiovský tgolembi at redhat.com
Tue Nov 13 22:36:06 UTC 2018


Some paths in the function are evaluated in libguestfs environment.
Previous commit copied the invalid construction. This is now fixed.

Signed-off-by: Tomáš Golembiovský <tgolembi at redhat.com>
---
 v2v/windows_virtio.ml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml
index eeee0096e..5d3dbde4d 100644
--- a/v2v/windows_virtio.ml
+++ b/v2v/windows_virtio.ml
@@ -294,15 +294,15 @@ and copy_from_virtio_win g inspect srcdir destdir filter =
       g2#launch ();
       let vio_root = "/" in
       g2#mount_ro "/dev/sda" vio_root;
-      let srcdir = vio_root // srcdir in
+      let srcdir = vio_root ^ "/" ^ srcdir in
       let paths = g2#find srcdir in
       Array.iter (
         fun path ->
-          let source = srcdir // path in
+          let source = srcdir ^ "/" ^ path in
           if g2#is_file source ~followsymlinks:false &&
                filter path inspect then (
             let target_name = String.lowercase_ascii (Filename.basename path) in
-            let target = destdir // target_name in
+            let target = destdir ^ "/" ^ target_name in
             debug "windows: copying guest tools bits: '%s:%s' -> '%s'"
                   virtio_win path target;
 
-- 
2.19.1




More information about the Libguestfs mailing list