Libguestfs - Feb 2020 - [PATCH v2 2/2] windows: small tweaks of qemu-ga firstboot script

This, together with the changes to common repo are fixes to the installation
qemu-ga MSI.

There is still an issue that I did not figure yet how to fix. On Windows 10 it
fails to register the QEMU-GA service.

Tomáš Golembiovský (2):
  windows: fix detection of qemu-ga installer on RHV
  windows: small tweaks of qemu-ga firstboot script

 v2v/convert_windows.ml | 8 +++++++-
 v2v/windows_virtio.ml  | 5 ++---
 2 files changed, 9 insertions(+), 4 deletions(-)

-- 
2.25.0

The detection was incorrectly matching only 32-bit installer on all
architectures.

Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com>
---
 v2v/windows_virtio.ml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/v2v/windows_virtio.ml b/v2v/windows_virtio.ml
index 5ec7664b..f8863a6a 100644
--- a/v2v/windows_virtio.ml
+++ b/v2v/windows_virtio.ml
@@ -450,14 +450,13 @@ and virtio_iso_path_matches_qemu_ga path inspect     *
elements.
    *)
   let lc_name = String.lowercase_ascii (Filename.basename path) in
-  lc_name = "rhev-qga.msi" ||
   match arch, lc_name with
   | ("i386", "qemu-ga-x86.msi")
   | ("i386", "qemu-ga-i386.msi")
-  | ("i386", "RHEV-QGA.msi")
+  | ("i386", "rhev-qga.msi")
   | ("x86_64", "qemu-ga-x64.msi")
   | ("x86_64", "qemu-ga-x86_64.msi")
-  | ("x86_64", "RHEV-QGA64.msi") -> true
+  | ("x86_64", "rhev-qga64.msi") -> true
   | _ -> false
 
 (* The following function is only exported for unit tests. *)
-- 
2.25.0

- match log file with script name
- restart manually only after successfull install, this also helps
  debugging because we can log the installer return code

Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com>
---
 v2v/convert_windows.ml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/v2v/convert_windows.ml b/v2v/convert_windows.ml
index 5b7a5bfe..0fda1d4e 100644
--- a/v2v/convert_windows.ml
+++ b/v2v/convert_windows.ml
@@ -430,7 +430,13 @@ popd
      fun msi_path ->
        let fb_script = "\
 echo Installing qemu-ga from " ^ msi_path ^ "
-\"\\" ^ msi_path ^ "\" /qn /forcerestart /l+*vx
\"%cd%\\qemu-ga.log\"
+\"\\" ^ msi_path ^ "\" /norestart /qn /l+*vx
\"%~dpn0.log\"
+set elvl=!errorlevel!
+echo Done installing qemu-ga error_level=!elvl!
+if !elvl! == 0 (
+  echo Restarting Windows...
+  shutdown /r /f /c \"rebooted by firstboot script\"
+)
 " in
       Firstboot.add_firstboot_script g inspect.i_root
         ("install " ^ msi_path) fb_script;
-- 
2.25.0

Seems reasonable to me, ACK series.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-top is 'top' for virtual machines.  Tiny program with many
powerful monitoring features, net stats, disk stats, logging, etc.
http://people.redhat.com/~rjones/virt-top