Merge pull request #23 from rainpole/windows-autounattend-fixup

Ryan Johnson · web-flow · commit 6e7bac1e6cab · 2021-08-04T19:52:42.000-04:00
Simplify Windows Autounattend.xml &lt;DriverPaths/&gt;
diff --git a/builds/windows/windows-server-2016/variables.auto.pkrvars.hcl b/builds/windows/windows-server-2016/variables.auto.pkrvars.hcl
@@ -28,25 +28,21 @@ vm_network_card             = "vmxnet3"
 vm_floppy_files_server_std_dexp = [
   "../../../configs/windows/windows-server-2016/standard/efi-secure/autounattend.xml",
   "../../../scripts/windows/",
-  "../../../drivers/windows",
   "../../../certificates/"
   ]
 vm_floppy_files_server_std_core = [
   "../../../configs/windows/windows-server-2016/standard-core/efi-secure/autounattend.xml",
   "../../../scripts/windows/",
-  "../../../drivers/windows",
   "../../../certificates/"
   ]
 vm_floppy_files_server_dc_dexp = [
   "../../../configs/windows/windows-server-2016/datacenter/efi-secure/autounattend.xml",
   "../../../scripts/windows/",
-  "../../../drivers/windows",
   "../../../certificates/"
   ]
 vm_floppy_files_server_dc_core = [
   "../../../configs/windows/windows-server-2016/datacenter-core/efi-secure/autounattend.xml",
   "../../../scripts/windows/",
-  "../../../drivers/windows",
   "../../../certificates/"
   ]
 vm_shutdown_command = "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\""
diff --git a/builds/windows/windows-server-2019/variables.auto.pkrvars.hcl b/builds/windows/windows-server-2019/variables.auto.pkrvars.hcl
@@ -28,25 +28,21 @@ vm_network_card             = "vmxnet3"
 vm_floppy_files_server_std_dexp = [
   "../../../configs/windows/windows-server-2019/standard/efi-secure/autounattend.xml",
   "../../../scripts/windows/",
-  "../../../drivers/windows",
   "../../../certificates/"
   ]
 vm_floppy_files_server_std_core = [
   "../../../configs/windows/windows-server-2019/standard-core/efi-secure/autounattend.xml",
   "../../../scripts/windows/",
-  "../../../drivers/windows",
   "../../../certificates/"
 ]
 vm_floppy_files_server_dc_dexp = [
   "../../../configs/windows/windows-server-2019/datacenter/efi-secure/autounattend.xml",
   "../../../scripts/windows/",
-  "../../../drivers/windows",
   "../../../certificates/"
   ]
 vm_floppy_files_server_dc_core = [
   "../../../configs/windows/windows-server-2019/datacenter-core/efi-secure/autounattend.xml",
   "../../../scripts/windows/",
-  "../../../drivers/windows",
   "../../../certificates/"
   ]
 vm_shutdown_command = "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\""
diff --git a/configs/windows/windows-server-2016/datacenter-core/bios/autounattend.xml b/configs/windows/windows-server-2016/datacenter-core/bios/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2016/datacenter-core/efi-secure/autounattend.xml b/configs/windows/windows-server-2016/datacenter-core/efi-secure/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2016/datacenter/bios/autounattend.xml b/configs/windows/windows-server-2016/datacenter/bios/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2016/datacenter/efi-secure/autounattend.xml b/configs/windows/windows-server-2016/datacenter/efi-secure/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2016/standard-core/bios/autounattend.xml b/configs/windows/windows-server-2016/standard-core/bios/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2016/standard-core/efi-secure/autounattend.xml b/configs/windows/windows-server-2016/standard-core/efi-secure/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2016/standard/bios/autounattend.xml b/configs/windows/windows-server-2016/standard/bios/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2016/standard/efi-secure/autounattend.xml b/configs/windows/windows-server-2016/standard/efi-secure/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2019/datacenter-core/bios/autounattend.xml b/configs/windows/windows-server-2019/datacenter-core/bios/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2019/datacenter-core/efi-secure/autounattend.xml b/configs/windows/windows-server-2019/datacenter-core/efi-secure/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2019/datacenter/bios/autounattend.xml b/configs/windows/windows-server-2019/datacenter/bios/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2019/datacenter/efi-secure/autounattend.xml b/configs/windows/windows-server-2019/datacenter/efi-secure/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2019/standard-core/bios/autounattend.xml b/configs/windows/windows-server-2019/standard-core/bios/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2019/standard-core/efi-secure/autounattend.xml b/configs/windows/windows-server-2019/standard-core/efi-secure/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2019/standard/bios/autounattend.xml b/configs/windows/windows-server-2019/standard/bios/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/configs/windows/windows-server-2019/standard/efi-secure/autounattend.xml b/configs/windows/windows-server-2019/standard/efi-secure/autounattend.xml
@@ -14,7 +14,7 @@
       <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-PnpCustomizationsWinPE" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
          <DriverPaths>
             <PathAndCredentials wcm:action="add" wcm:keyValue="1">
-               <Path>A:\</Path>
+               <Path>E:\Program Files\VMware\VMware Tools\Drivers\pvscsi\Win8\amd64</Path>
             </PathAndCredentials>
          </DriverPaths>
       </component>
diff --git a/drivers/windows/pvscsi/pvscsi.cat b/drivers/windows/pvscsi/pvscsi.cat
diff --git a/drivers/windows/pvscsi/pvscsi.inf b/drivers/windows/pvscsi/pvscsi.inf
diff --git a/drivers/windows/pvscsi/pvscsi.sys b/drivers/windows/pvscsi/pvscsi.sys
diff --git a/drivers/windows/pvscsi/txtsetup.oem b/drivers/windows/pvscsi/txtsetup.oem
