On Fri, Feb 27, 2015 at 03:09:31PM +0000, Richard W.M. Jones wrote:
On Fri, Feb 27, 2015 at 05:28:58PM +0300, Roman Kagan wrote:
> Make the location of the Windows virtio drivers overridable with the
> environment variable VIRTIO_WIN_DIR, in the same vein as is done for
> virt-tools.
>
> Signed-off-by: Roman Kagan <rkagan(a)parallels.com>
> ---
> v2v/convert_windows.ml | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml
> index 0cd818a..e966341 100644
> --- a/v2v/convert_windows.ml
> +++ b/v2v/convert_windows.ml
> @@ -47,7 +47,9 @@ let convert ~verbose ~keep_serial_console (g : G.guestfs) inspect
source =
> try Sys.getenv "VIRT_TOOLS_DATA_DIR"
> with Not_found -> Config.datadir // "virt-tools" in
>
> - let virtio_win_dir = "/usr/share/virtio-win" in
> + let virtio_win_dir =
> + try Sys.getenv "VIRTIO_WIN_DIR"
> + with Not_found -> Config.datadir // "virtio-win" in
This slightly changes the semantics, especially for people who don't
use `./configure --prefix /usr'. But I guess that's OK.
I guess so too.
The main problem with the patch is that it doesn't update the
documentation (v2v/virt-v2v.pod).
Indeed. I'll add a note to the docs and resubmit.
Thanks,
Roman.