Libguestfs - Jun 2016 - [PATCH] v2v: recognize Virtuozzo tools as Parallels tools

Recent updates of Virtuozzo Server 6 (fka Parallels Cloud Server 6) have
"Virtuozzo tools" instead of "Parallels tools" as their
display name in
the corresponding Uninstall registry key.

Recognize those, too, and schedule their uninstallation on first boot.

Signed-off-by: Roman Kagan <rkagan at virtuozzo.com>
---
 v2v/convert_windows.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml
index 62bb536..49811a7 100644
--- a/v2v/convert_windows.ml
+++ b/v2v/convert_windows.ml
@@ -183,7 +183,7 @@ let convert ~keep_serial_console (g : G.guestfs) inspect
source rcaps                   raise Not_found;
 
                let dispname = g#hivex_value_utf8 valueh in
-               if not (Str.string_match (Str.regexp ".*Parallels
Tools.*")
+               if not (Str.string_match (Str.regexp
".*\\(Parallels\\|Virtuozzo\\) Tools.*")
                                         dispname 0) then
                  raise Not_found;
 
-- 
2.5.5

On Fri, Jun 03, 2016 at 08:24:43PM +0300, Roman Kagan
wrote:
> Recent updates of Virtuozzo Server 6 (fka Parallels Cloud Server 6) have
> "Virtuozzo tools" instead of "Parallels tools" as their
display name in
> the corresponding Uninstall registry key.
> 
> Recognize those, too, and schedule their uninstallation on first boot.
> 
> Signed-off-by: Roman Kagan <rkagan at virtuozzo.com>
> ---
>  v2v/convert_windows.ml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml
> index 62bb536..49811a7 100644
> --- a/v2v/convert_windows.ml
> +++ b/v2v/convert_windows.ml
> @@ -183,7 +183,7 @@ let convert ~keep_serial_console (g : G.guestfs)
inspect source rcaps >                   raise Not_found;
>  
>                 let dispname = g#hivex_value_utf8 valueh in
> -               if not (Str.string_match (Str.regexp ".*Parallels
Tools.*")
> +               if not (Str.string_match (Str.regexp
".*\\(Parallels\\|Virtuozzo\\) Tools.*")
>                                          dispname 0) then
>                   raise Not_found;
ACK.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-builder quickly builds VMs from scratch
http://libguestfs.org/virt-builder.1.html