Fix pvscsi dedicated xml reference
Some checks reported errors
continuous-integration/drone/push Build was killed

This commit is contained in:
Danny Bessems 2021-06-24 09:03:06 +02:00
parent 0958d6a352
commit 0c19c023de
2 changed files with 30 additions and 32 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<unattend xmlns="urn:schemas-microsoft-com:unattend"> <unattend xmlns="urn:schemas-microsoft-com:unattend">
<servicing/> <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"> <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> <DriverPaths>
<PathAndCredentials wcm:action="add" wcm:keyValue="1"> <PathAndCredentials wcm:action="add" wcm:keyValue="1">
@ -9,8 +9,6 @@
</PathAndCredentials> </PathAndCredentials>
</DriverPaths> </DriverPaths>
</component> </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"> <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> <DiskConfiguration>
<Disk wcm:action="add"> <Disk wcm:action="add">

View File

@ -104,7 +104,7 @@ source "vsphere-iso" "srv2019-virtual" {
usb_controller = ["xhci"] usb_controller = ["xhci"]
floppy_files = [ floppy_files = [
"packer/preseed/Server2019/pvscsi/Autounattend.xml", "packer/preseed/Server2019/Autounattend.xml",
"packer/preseed/Server2019/Sysprep_Unattend.xml", "packer/preseed/Server2019/Sysprep_Unattend.xml",
"scripts/Set-NetworkProfile.ps1", "scripts/Set-NetworkProfile.ps1",
"scripts/Disable-WinRM.ps1", "scripts/Disable-WinRM.ps1",
@ -163,7 +163,7 @@ source "vsphere-iso" "srv2019-baremetal" {
usb_controller = ["xhci"] usb_controller = ["xhci"]
floppy_files = [ floppy_files = [
"packer/preseed/Server2019/Autounattend.xml", "packer/preseed/Server2019/pvscsi/Autounattend.xml",
"packer/preseed/Server2019/Sysprep_Unattend.xml", "packer/preseed/Server2019/Sysprep_Unattend.xml",
"scripts/Set-NetworkProfile.ps1", "scripts/Set-NetworkProfile.ps1",
"scripts/Disable-WinRM.ps1", "scripts/Disable-WinRM.ps1",
@ -187,42 +187,42 @@ source "vsphere-iso" "srv2019-baremetal" {
build { build {
sources = [ sources = [
"source.vsphere-iso.srv2019-template", "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 "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" { provisioner "powershell" {
scripts = [ inline = [
"scripts/Install-WinGet.ps1" "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12",
"Invoke-Expression ((New-Object Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))"
] ]
} }
provisioner "powershell" { provisioner "powershell" {
inline = [ inline = [
"winget install mozilla.firefox", "choco config set --name=limit-output --value=LimitOutput",
"winget install 7zip.7zip", "choco install -y dotnetfx",
"winget install microsoft.dotnetframework" "choco install -y 7zip.install",
"choco install -y sysinternals",
"choco install -y firefox"
] ]
// valid_exit_codes = [0, 3010] 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" { provisioner "windows-update" {
} }