From 0c19c023de904935a2f503f10be16b63d88c8773 Mon Sep 17 00:00:00 2001
From: djpbessems <danny@bessems.eu>
Date: Thu, 24 Jun 2021 09:03:06 +0200
Subject: [PATCH] Fix pvscsi dedicated xml reference

---
 .../Server2019/pvscsi/Autounattend.xml        |  4 +-
 packer/windowsserver2019.pkr.hcl              | 58 +++++++++----------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/packer/preseed/Server2019/pvscsi/Autounattend.xml b/packer/preseed/Server2019/pvscsi/Autounattend.xml
index e2ef660..fcdcd74 100644
--- a/packer/preseed/Server2019/pvscsi/Autounattend.xml
+++ b/packer/preseed/Server2019/pvscsi/Autounattend.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <unattend xmlns="urn:schemas-microsoft-com:unattend">
     <servicing/>
-    <settings pass="auditSystem">
+    <settings pass="windowsPE">
         <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">
@@ -9,8 +9,6 @@
                 </PathAndCredentials>
             </DriverPaths>
         </component>
-    </settings>
-    <settings pass="windowsPE">
         <component xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Microsoft-Windows-Setup" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS">
             <DiskConfiguration>
                 <Disk wcm:action="add">
diff --git a/packer/windowsserver2019.pkr.hcl b/packer/windowsserver2019.pkr.hcl
index 2dbb323..f3167c6 100644
--- a/packer/windowsserver2019.pkr.hcl
+++ b/packer/windowsserver2019.pkr.hcl
@@ -104,7 +104,7 @@ source "vsphere-iso" "srv2019-virtual" {
   usb_controller          = ["xhci"]
 
   floppy_files            = [
-    "packer/preseed/Server2019/pvscsi/Autounattend.xml",
+    "packer/preseed/Server2019/Autounattend.xml",
     "packer/preseed/Server2019/Sysprep_Unattend.xml",
     "scripts/Set-NetworkProfile.ps1",
     "scripts/Disable-WinRM.ps1",
@@ -163,7 +163,7 @@ source "vsphere-iso" "srv2019-baremetal" {
   usb_controller          = ["xhci"]
 
   floppy_files            = [
-    "packer/preseed/Server2019/Autounattend.xml",
+    "packer/preseed/Server2019/pvscsi/Autounattend.xml",
     "packer/preseed/Server2019/Sysprep_Unattend.xml",
     "scripts/Set-NetworkProfile.ps1",
     "scripts/Disable-WinRM.ps1",
@@ -187,42 +187,42 @@ source "vsphere-iso" "srv2019-baremetal" {
 build {
   sources = [
     "source.vsphere-iso.srv2019-template",
-    "source.vsphere-iso.srv2019-virtual"
+    "source.vsphere-iso.srv2019-virtual",
+    "source.vsphere-iso.srv2019-baremetal"
   ]
-  // "source.vsphere-iso.srv2019-baremetal"
 
   provisioner "windows-update" {
   }
 
-  provisioner "powershell" {
-    scripts = [
-      "scripts/Install-WinGet.ps1"
-    ]
-  }
-  provisioner "powershell" {
-    inline = [
-      "winget install mozilla.firefox",
-      "winget install 7zip.7zip",
-      "winget install microsoft.dotnetframework"
-    ]
-    // valid_exit_codes = [0, 3010]
-  }
+  // provisioner "powershell" {
+  //   scripts = [
+  //     "scripts/Install-WinGet.ps1"
+  //   ]
+  // }
   // provisioner "powershell" {
   //   inline = [
-  //     "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12",
-  //     "Invoke-Expression ((New-Object Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
+  //     "winget install mozilla.firefox",
+  //     "winget install 7zip.7zip",
+  //     "winget install microsoft.dotnetframework"
   //   ]
+  //   // valid_exit_codes = [0, 3010]
   // }
-  // provisioner "powershell" {
-  //   inline           = [
-  //     "choco config set --name=limit-output --value=LimitOutput",
-  //     "choco install -y dotnetfx",
-  //     "choco install -y 7zip.install",
-  //     "choco install -y sysinternals",
-  //     "choco install -y firefox"
-  //   ]
-  //   valid_exit_codes = [0, 3010]
-  // }
+  provisioner "powershell" {
+    inline = [
+      "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12",
+      "Invoke-Expression ((New-Object Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
+    ]
+  }
+  provisioner "powershell" {
+    inline           = [
+      "choco config set --name=limit-output --value=LimitOutput",
+      "choco install -y dotnetfx",
+      "choco install -y 7zip.install",
+      "choco install -y sysinternals",
+      "choco install -y firefox"
+    ]
+    valid_exit_codes = [0, 3010]
+  }
 
   provisioner "windows-update" {
   }