|
 |
c659c5 |
From fd9694a3a2ea2911335cd3a85558a92b14d946fc Mon Sep 17 00:00:00 2001
|
|
|
c659c5 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
c659c5 |
Date: Mon, 16 Jan 2023 12:19:29 +0000
|
|
|
c659c5 |
Subject: [PATCH] convert: windows: Remove extraneous blank lines in source
|
|
|
c659c5 |
|
|
|
c659c5 |
---
|
|
|
c659c5 |
convert/convert_windows.ml | 1 -
|
|
|
c659c5 |
convert/windows_virtio.ml | 1 -
|
|
|
c659c5 |
2 files changed, 2 deletions(-)
|
|
|
c659c5 |
|
|
|
c659c5 |
diff --git a/convert/convert_windows.ml b/convert/convert_windows.ml
|
|
|
c659c5 |
index 57a7ff03..b0436fe4 100644
|
|
|
c659c5 |
--- a/convert/convert_windows.ml
|
|
|
c659c5 |
+++ b/convert/convert_windows.ml
|
|
|
c659c5 |
@@ -476,7 +476,6 @@ let convert (g : G.guestfs) _ inspect _ static_ips =
|
|
|
c659c5 |
(sprintf "install-%s.ps1" msi_path) !psh_script;
|
|
|
c659c5 |
) files
|
|
|
c659c5 |
|
|
|
c659c5 |
-
|
|
|
c659c5 |
and unconfigure_xenpv () =
|
|
|
c659c5 |
match xenpv_uninst with
|
|
|
c659c5 |
| None -> () (* nothing to be uninstalled *)
|
|
|
c659c5 |
diff --git a/convert/windows_virtio.ml b/convert/windows_virtio.ml
|
|
|
c659c5 |
index d9fda13f..2ce92ece 100644
|
|
|
c659c5 |
--- a/convert/windows_virtio.ml
|
|
|
c659c5 |
+++ b/convert/windows_virtio.ml
|
|
|
c659c5 |
@@ -215,7 +215,6 @@ and copy_qemu_ga g inspect =
|
|
|
c659c5 |
(fun () ->
|
|
|
c659c5 |
error (f_"root directory ‘/’ is missing from the virtio-win directory or ISO.\n\nThis should not happen and may indicate that virtio-win or virt-v2v is broken in some way. Please report this as a bug with a full debug log."))
|
|
|
c659c5 |
|
|
|
c659c5 |
-
|
|
|
c659c5 |
(* Copy all files from virtio_win directory/ISO located in [srcdir]
|
|
|
c659c5 |
* subdirectory and all its subdirectories to the [destdir]. The directory
|
|
|
c659c5 |
* hierarchy is not preserved, meaning all files will be directly in [destdir].
|