diff --git a/lib/gusztavvargadr/chef b/lib/gusztavvargadr/chef index 8a396bb60..428a002ac 160000 --- a/lib/gusztavvargadr/chef +++ b/lib/gusztavvargadr/chef @@ -1 +1 @@ -Subproject commit 8a396bb6066cc75b09ae9efca5c668d1935cfe0a +Subproject commit 428a002acd124aff76379753239e2b7277f44440 diff --git a/src/u/packer/builders/hyperv/template.json b/src/u/packer/builders/hyperv/template.json index aba8fbb6d..f2af86e82 100644 --- a/src/u/packer/builders/hyperv/template.json +++ b/src/u/packer/builders/hyperv/template.json @@ -1,4 +1,5 @@ { + "min_packer_version": "1.3.0", "variables": { "hyperv_ram_size": "4096", "hyperv_enable_dynamic_memory": "false", diff --git a/src/w/chef/cookbooks/gusztavvargadr_packer_w/attributes/virtualbox_guest_additions.rb b/src/w/chef/cookbooks/gusztavvargadr_packer_w/attributes/virtualbox_guest_additions.rb index 572d47a7d..1bc91ff7c 100644 --- a/src/w/chef/cookbooks/gusztavvargadr_packer_w/attributes/virtualbox_guest_additions.rb +++ b/src/w/chef/cookbooks/gusztavvargadr_packer_w/attributes/virtualbox_guest_additions.rb @@ -1,3 +1,3 @@ default['gusztavvargadr_packer_w']['virtualbox_guest_additions'] = { - 'version' => '5.2.22', + 'version' => '5.2.26', } diff --git a/src/w/chef/cookbooks/gusztavvargadr_packer_w/recipes/cleanup.rb b/src/w/chef/cookbooks/gusztavvargadr_packer_w/recipes/cleanup.rb index ef99925aa..c81495ed7 100644 --- a/src/w/chef/cookbooks/gusztavvargadr_packer_w/recipes/cleanup.rb +++ b/src/w/chef/cookbooks/gusztavvargadr_packer_w/recipes/cleanup.rb @@ -39,7 +39,7 @@ gusztavvargadr_windows_powershell_script_elevated 'Zeroing volume' do code <<-EOH - sdelete -nobanner -z C: + sdelete -nobanner -p 3 -z C: EOH action :run end diff --git a/src/w/chef/cookbooks/gusztavvargadr_packer_w/recipes/prepare.rb b/src/w/chef/cookbooks/gusztavvargadr_packer_w/recipes/prepare.rb index 21b07b768..ccb302f75 100644 --- a/src/w/chef/cookbooks/gusztavvargadr_packer_w/recipes/prepare.rb +++ b/src/w/chef/cookbooks/gusztavvargadr_packer_w/recipes/prepare.rb @@ -13,4 +13,8 @@ guest_additions_options node['gusztavvargadr_packer_w']['virtualbox_guest_additions'] action :install end + + gusztavvargadr_windows_chocolatey_package 'virtio-drivers' do + action :install + end end diff --git a/src/w/packer/builders/amazon-ebs/userdata.ps1 b/src/w/packer/builders/amazon-ebs/userdata.ps1 index fd4b1c1b4..b1d14e773 100644 --- a/src/w/packer/builders/amazon-ebs/userdata.ps1 +++ b/src/w/packer/builders/amazon-ebs/userdata.ps1 @@ -10,10 +10,10 @@ Write-Host "Install Chef Client" choco install chef-client -y --version 14.3.37 Write-Host "Install 7zip" -choco install 7zip.portable -y --version 18.5 +choco install 7zip.portable -y --version 18.6 Write-Host "Install sdelete" -choco install sdelete -y --version 2.01 +choco install sdelete -y --version 2.01 --ignorechecksum Write-Host "Configure network profiles" Get-NetConnectionProfile | ForEach-Object { Set-NetConnectionProfile -InterfaceIndex $_.InterfaceIndex -NetworkCategory Private } @@ -36,8 +36,7 @@ netsh advfirewall firewall delete rule name="Autounattend WinRM-HTTP" Write-Host "Install OpenSSH" netsh advfirewall firewall add rule name="Autounattend SSH" dir=in localport=22 protocol=TCP action=block -# choco install openssh -y --version 7.7.2.1 -params '"/SSHServerFeature /PathSpecsToProbeForShellEXEString:$env:windir\system32\windowspowershell\v1.0\powershell.exe"' -choco install openssh -y --version 7.7.2.1 -params '"/SSHServerFeature"' +choco install openssh -y --version 7.9.0.1 -params '"/SSHServerFeature"' # /PathSpecsToProbeForShellEXEString:$env:windir\system32\windowspowershell\v1.0\powershell.exe"' sc.exe config sshd start= auto net stop sshd netsh advfirewall firewall delete rule name="Autounattend SSH" diff --git a/src/w/packer/builders/hyperv/template.json b/src/w/packer/builders/hyperv/template.json index 8943c56ac..da35e4b6e 100644 --- a/src/w/packer/builders/hyperv/template.json +++ b/src/w/packer/builders/hyperv/template.json @@ -1,4 +1,5 @@ { + "min_packer_version": "1.3.0", "variables": { "builder_source": "builders", "builder_destination": "C:/Windows/Setup/packer", diff --git a/src/w/packer/builders/iso/floppy/Autounattend.ps1 b/src/w/packer/builders/iso/floppy/Autounattend.ps1 index cdd443c02..0ec3019d5 100644 --- a/src/w/packer/builders/iso/floppy/Autounattend.ps1 +++ b/src/w/packer/builders/iso/floppy/Autounattend.ps1 @@ -8,10 +8,10 @@ Write-Host "Install Chef Client" choco install chef-client -y --version 14.3.37 Write-Host "Install 7zip" -choco install 7zip.portable -y --version 18.5 +choco install 7zip.portable -y --version 18.6 Write-Host "Install sdelete" -choco install sdelete -y --version 2.01 +choco install sdelete -y --version 2.01 --ignorechecksum Write-Host "Configure network profiles" Get-NetConnectionProfile | ForEach-Object { Set-NetConnectionProfile -InterfaceIndex $_.InterfaceIndex -NetworkCategory Private } @@ -34,8 +34,7 @@ netsh advfirewall firewall delete rule name="Autounattend WinRM-HTTP" Write-Host "Install OpenSSH" netsh advfirewall firewall add rule name="Autounattend SSH" dir=in localport=22 protocol=TCP action=block -# choco install openssh -y --version 7.7.2.1 -params '"/SSHServerFeature /PathSpecsToProbeForShellEXEString:$env:windir\system32\windowspowershell\v1.0\powershell.exe"' -choco install openssh -y --version 7.7.2.1 -params '"/SSHServerFeature"' +choco install openssh -y --version 7.9.0.1 -params '"/SSHServerFeature"' # /PathSpecsToProbeForShellEXEString:$env:windir\system32\windowspowershell\v1.0\powershell.exe"' sc.exe config sshd start= auto net stop sshd netsh advfirewall firewall delete rule name="Autounattend SSH" diff --git a/src/w1809de/packer/builders/iso/template.json b/src/w1809de/packer/builders/iso/template.json index 19cee4ffb..e19b22712 100644 --- a/src/w1809de/packer/builders/iso/template.json +++ b/src/w1809de/packer/builders/iso/template.json @@ -1,7 +1,7 @@ { "variables": { - "iso_url": "https://software-download.microsoft.com/download/pr/17763.1.180914-1434.rs5_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", + "iso_url": "https://software-download.microsoft.com/download/sg/17763.107.101029-1455.rs5_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", "iso_checksum_type": "sha1", - "iso_checksum": "b8a6ffac9e15240c39f2ed2b16204341f564208d" + "iso_checksum": "164f022a22d2305e6fbd82f6e35d530b6bbadca8" } } diff --git a/src/w1809ss/packer/builders/iso/template.json b/src/w1809ss/packer/builders/iso/template.json index b19a51889..e802d4593 100644 --- a/src/w1809ss/packer/builders/iso/template.json +++ b/src/w1809ss/packer/builders/iso/template.json @@ -1,7 +1,7 @@ { "variables": { - "iso_url": "https://software-download.microsoft.com/download/pr/17763.1.180914-1434.rs5_release_SERVER_EVAL_x64FRE_en-us.iso", + "iso_url": "https://software-download.microsoft.com/download/sg/17763.253.190108-0006.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso", "iso_checksum_type": "sha1", - "iso_checksum": "c4834f538a90bb41f625144c9a2e0edf8bb9b9b5" + "iso_checksum": "91e3a2f1acc39af21353c7cc105c799494d7539f" } }