From 3749c850178cf5c6b2c76e5cdae4dc0e59748dc1 Mon Sep 17 00:00:00 2001
From: Dani Llewellyn <diddledani@ubuntu.com>
Date: Tue, 12 Oct 2021 15:45:11 +0100
Subject: [PATCH] [WINDOWS] more preinstalled drivers & guest-agent

* Update the autounattend file with the remaining virtio drivers
* Update the autounattend file with an installation step for the guest agent
* Remove obsolete instructions for steps that the autounattend file handles now

Signed-off-by: Dani Llewellyn <diddledani@ubuntu.com>
---
 README.md |  2 --
 quickget  | 36 ++++++++++++++++++++++++++++++++----
 2 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index aa2c088..a0a41e3 100644
--- a/README.md
+++ b/README.md
@@ -245,8 +245,6 @@ quickemu --vm windows-11.conf
 
   * Complete the installation as you normally would.
   * Post-install:
-    * Run the VirtIO installer (`virtio-win-gt-x64`) from the CD Drive (E:).
-    * Run the Guest Tools installer (`virtio-win-guest-tools`) from the CD Drive (E:).
     * Download and install [spice-webdavd](https://www.spice-space.org/download/windows/spice-webdavd/spice-webdavd-x64-latest.msi)
       * Enables file sharing between the host and guest.
     * Download and install [UsbDk](https://www.spice-space.org/download/windows/usbdk/)
diff --git a/quickget b/quickget
index 2f8fbe7..703344f 100755
--- a/quickget
+++ b/quickget
@@ -187,22 +187,43 @@ function unattended_windows() {
       <!--
            This makes the VirtIO drivers available to Windows, assuming that
            the VirtIO driver disk
-           (https://alt.fedoraproject.org/pub/alt/virtio-win/latest/images/bin/)
+           (https://github.com/virtio-win/virtio-win-pkg-scripts/blob/master/README.md)
            is available as drive E:
       -->
       <DriverPaths>
         <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-          <Path>E:\amd64\w10</Path>
+          <Path>E:\qemufwcfg\w10\amd64</Path>
         </PathAndCredentials>
         <PathAndCredentials wcm:action="add" wcm:keyValue="2">
-          <Path>E:\viogpudo\w10\amd64</Path>
+          <Path>E:\vioinput\w10\amd64</Path>
         </PathAndCredentials>
         <PathAndCredentials wcm:action="add" wcm:keyValue="3">
-          <Path>E:\viorng\w10\amd64</Path>
+          <Path>E:\vioscsi\w10\amd64</Path>
         </PathAndCredentials>
         <PathAndCredentials wcm:action="add" wcm:keyValue="4">
+          <Path>E:\viostor\w10\amd64</Path>
+        </PathAndCredentials>
+        <PathAndCredentials wcm:action="add" wcm:keyValue="5">
+          <Path>E:\vioserial\w10\amd64</Path>
+        </PathAndCredentials>
+        <PathAndCredentials wcm:action="add" wcm:keyValue="6">
+          <Path>E:\qxldod\w10\amd64</Path>
+        </PathAndCredentials>
+        <PathAndCredentials wcm:action="add" wcm:keyValue="7">
+          <Path>E:\amd64\w10</Path>
+        </PathAndCredentials>
+        <PathAndCredentials wcm:action="add" wcm:keyValue="8">
+          <Path>E:\viogpudo\w10\amd64</Path>
+        </PathAndCredentials>
+        <PathAndCredentials wcm:action="add" wcm:keyValue="9">
+          <Path>E:\viorng\w10\amd64</Path>
+        </PathAndCredentials>
+        <PathAndCredentials wcm:action="add" wcm:keyValue="10">
           <Path>E:\NetKVM\w10\amd64</Path>
         </PathAndCredentials>
+        <PathAndCredentials wcm:action="add" wcm:keyValue="11">
+          <Path>E:\viofs\w10\amd64</Path>
+        </PathAndCredentials>
       </DriverPaths>
     </component>
   </settings>
@@ -230,6 +251,13 @@ function unattended_windows() {
         <HideOEMRegistrationScreen>true</HideOEMRegistrationScreen>
         <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>
       </OOBE>
+      <FirstLogonCommands>
+        <SynchronousCommand wcm:action="add">
+          <CommandLine>msiexec /i E:\guest-agent\qemu-ga-x86_64.msi /quiet /passive /qn</CommandLine>
+          <Description></Description>
+          <Order>1</Order>
+        </SynchronousCommand>
+      </FirstLogonCommands>
     </component>
   </settings>
 </unattend>