search for: extra_uninstall_str

It seems newer versions of VMware Tools for Windows can be uninstalled also when the guest does not run on VMware anymore. Hence, attempt to uninstall them during a conversion, reusing the same code already used to uninstall Parallel Tools. This was tested with the following Windows guests: - Windows 2008r2 - Windows 2012r2 - Windows 2016 - Windows 7 - Windows 8 - Windows 10 Pino Toscano (2):

...= Not_found -> None ) in - (* Locate and retrieve all uninstallation commands for Parallels Tools *) - let prltools_uninsts = + (* Locate and retrieve all the uninstallation commands for installed + * applications. + *) + let unistallation_commands pretty_name matchfn extra_uninstall_string = let uninsts = ref [] in Registry.with_hive_readonly g inspect.i_windows_software_hive @@ -146,25 +148,25 @@ let convert (g : G.guestfs) inspect source output rcaps = raise Not_found; let dispname = g#hivex_value_string valueh in - i...

...740afd1c..2d2b6adfe 100644 --- a/v2v/convert_windows.ml +++ b/v2v/convert_windows.ml @@ -192,6 +192,13 @@ let convert (g : G.guestfs) inspect source output rcaps = Some "PREVENT_REBOOT=Yes LAUNCHED_BY_SETUP_EXE=Yes" in unistallation_commands "Parallels Tools" matchfn extra_uninstall_string in + (* Locate and retrieve all uninstallation commands for VMware Tools. *) + let vmwaretools_uninst = + let matchfn s = + String.find s "VMware Tools" != -1 + in + unistallation_commands "VMware Tools" matchfn None in + (*-------------------------------...