search for: fix_win_esp

...windows.ml b/v2v/convert_windows.ml > index 62bb536..8579240 100644 > --- a/v2v/convert_windows.ml > +++ b/v2v/convert_windows.ml > @@ -466,6 +466,45 @@ if errorlevel 3010 exit /b 0 > ignore (g#pwrite_device rootpart bytes 0x1a_L) > ) > ) > + > + and fix_win_esp () = > + let fix_win_uefi_bcd esp_path = > + try > + let bcd_path = "/EFI/Microsoft/Boot/BCD" in > + Windows.with_hive_write g (esp_path ^ bcd_path) ( > + (* Remove the 'graphicsmodedisabled' key in BCD *) > + fun root -&gt...

...the Windows guest. *) @@ -228,6 +228,8 @@ let convert (g : G.guestfs) inspect source output rcaps = Registry.with_hive_write g inspect.i_windows_software_hive update_software_hive; + configure_network_interfaces net_driver; + fix_ntfs_heads (); fix_win_esp (); @@ -603,6 +605,77 @@ if errorlevel 3010 exit /b 0 | None -> warning (f_"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion") + and configure_network_interfaces net_driver = + (* If we were asked to force network interfaces to have part...

...the Windows guest. *) @@ -228,6 +228,8 @@ let convert (g : G.guestfs) inspect source output rcaps = Registry.with_hive_write g inspect.i_windows_software_hive update_software_hive; + configure_network_interfaces net_driver; + fix_ntfs_heads (); fix_win_esp (); @@ -603,6 +605,77 @@ if errorlevel 3010 exit /b 0 | None -> warning (f_"could not find registry key HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion") + and configure_network_interfaces net_driver = + (* If we were asked to force network interfaces to have part...

--- v2v/windows.ml | 24 ++++++++++++++++++++++++ v2v/windows.mli | 6 ++++++ 2 files changed, 30 insertions(+) diff --git a/v2v/windows.ml b/v2v/windows.ml index 23d589b00..dde64e677 100644 --- a/v2v/windows.ml +++ b/v2v/windows.ml @@ -19,6 +19,7 @@ open Printf open Common_gettext.Gettext +open Std_utils open Tools_utils open Utils @@ -45,3 +46,26 @@ and check_app { Guestfs.app2_name

Patch v2 was here: https://www.redhat.com/archives/libguestfs/2019-April/thread.html#00114 There's no change here except that I've rebased it against the latest master branch and retested. There was a comment by Pino (https://www.redhat.com/archives/libguestfs/2019-April/msg00117.html) which isn't incorporated into this patch. Rich.

This patch is just for discussion. There are still a couple of issues that I'm trying to fix. One is that all of the test guests I have, even ones with static IPs, have multiple interfaces, some using DHCP, so the conditions for adding the Powershell script don't kick in. This makes testing very awkward. However a bigger issue is that I think the premise is wrong. In some registries

v1 was here with much discussion: https://www.redhat.com/archives/libguestfs/2018-December/msg00048.html v2: - Fix the case where there are multiple interfaces. Note this does not preserve order correctly (see patch for comment on why that is a hard problem). - Preserve name servers. This patch is still for discussion only. I'd like to see what might be done to get this upstream

Essentially identical to v1 except that it now uses (overloads?) the --mac option to supply this data. Rich.